      },
      {
 diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
-index fb23684..585fe92 100644
+index dbf1c80..89184d7 100644
 --- a/ui/aura/demo/demo_main.cc
 +++ b/ui/aura/demo/demo_main.cc
 @@ -24,6 +24,8 @@

           # Whether we're a traditional desktop unix.
           ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
             'desktop_linux%': 1,
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index b5fbb8e..3da824f 100644
--- a/content/shell/app/shell_main_delegate.cc


This is patch is a hack and in principle shouldn't be extended much.
---
 ash/shell/content_client/shell_main_delegate.cc |    5 +++++
 build/common.gypi                               |    6 ++++++
 chrome/app/chrome_main_delegate.cc              |    9 +++++++++
 content/shell/app/shell_main_delegate.cc        |   15 +++++++++++++++
 ui/aura/aura.gyp                                |    5 +++++
 ui/aura/demo/demo_main.cc                       |    9 +++++++++
 6 files changed, 49 insertions(+)

diff --git a/ash/shell/content_client/shell_main_delegate.cc b/ash/shell/content_client/shell_main_delegate.cc
index 014fae1..c749aed 100644
--- a/ash/shell/content_client/shell_main_delegate.cc
+++ b/ash/shell/content_client/shell_main_delegate.cc
@@ -9,6 +9,8 @@
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"

+#include "ozone/impl/ozone_display.h"
+
 namespace ash {
 namespace shell {

@@ -29,6 +31,9 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
 }

 void ShellMainDelegate::PreSandboxStartup() {
+  /* TODO: Implementation specific. Has to go away */
+  ui::SurfaceFactoryOzone *o_factory = new ozonewayland::OzoneDisplay();
+  ui::SurfaceFactoryOzone::SetInstance(o_factory);
   InitializeResourceBundle();
 }

diff --git a/build/common.gypi b/build/common.gypi
index 360f81a..ce708ea 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -143,6 +143,12 @@
