            ['OS=="mac" or chromeos==1', {
              'enable_hidpi%': 1,
 diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
-index 8e60a32..269bb8b 100644
+index 8e60a32..d69ca7a 100644
 --- a/content/shell/app/shell_main_delegate.cc
 +++ b/content/shell/app/shell_main_delegate.cc
 @@ -24,6 +24,9 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/gl/gl_switches.h"
  
-+#include "ozone/desktop_factory_wayland.h"
-+#include "ozone/surface_factory_wayland.h"
++#include "ozone/impl/desktop_factory_wayland.h"
++#include "ozone/impl/surface_factory_wayland.h"
 +
  #include "ipc/ipc_message.h"  // For IPC_MESSAGE_LOG_ENABLED.
  

     },
     {
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 9bd8ad0..5506f98 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -23,6 +23,8 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 
+#include "ozone/surface_factory_wayland.h"
+
 #if defined(USE_X11)
 #include "base/message_loop/message_pump_aurax11.h"

From fed966c3ad538e7aac913f80c01dc91b1e475ddc Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Mon, 1 Jul 2013 19:10:53 -0300
Subject: [PATCH 3/6] Set Wayland as the implementation for
