From 45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Tue, 13 May 2014 23:25:06 +0000 Subject: Revert 270232 "linux_aura: Compile ash into chrome." Reverted once again because because there are two more static initializers. > linux_aura: Compile ash into chrome. > > [This is a reland now that the static initializers should be fixed.] > > Running chrome with the "--open-ash" parameter will create an ash > desktop window. Ash on Linux has some problems, but at least we're now > compiling the code into the binary. > > TODO: The applist isn't positioned correctly, and some details of the > system tray aren't correct. > > BUG=300084, 303862 > TBR=sky@chromium.org > First Review URL: https://codereview.chromium.org/25108005 > > Review URL: https://codereview.chromium.org/270383007 TBR=erg@chromium.org Review URL: https://codereview.chromium.org/287783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270241 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/display/display_controller.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ash/display/display_controller.cc') diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index e4d33fb..498aef3 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -43,8 +43,6 @@ #include "ash/display/display_configurator_animation.h" #include "base/sys_info.h" #include "base/time/time.h" -#endif // defined(OS_CHROMEOS) - #if defined(USE_X11) #include "ui/base/x/x11_util.h" #include "ui/gfx/x/x11_types.h" @@ -54,7 +52,7 @@ #include #undef RootWindow #endif // defined(USE_X11) - +#endif // defined(OS_CHROMEOS) namespace ash { namespace { -- cgit v1.1