diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
| commit | 45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f (patch) | |
| tree | cffc5e3be784e5fcebe2d6390055d9b010df3c46 /ash/display/display_controller.cc | |
| parent | 93f942621d858fdae51cdecf3d2f234967b671aa (diff) | |
| download | chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.zip chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.gz chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.bz2 | |
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
Diffstat (limited to 'ash/display/display_controller.cc')
| -rw-r--r-- | ash/display/display_controller.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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 <X11/extensions/Xrandr.h> #undef RootWindow #endif // defined(USE_X11) - +#endif // defined(OS_CHROMEOS) namespace ash { namespace { |