diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:23:58 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:23:58 +0000 |
| commit | 151193028c0a4e5a1dbabc6b373335c0117c5574 (patch) | |
| tree | 1cadf2f985e388a791b74b2188f7727a8289c87d /ash/display | |
| parent | b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1 (diff) | |
| download | chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.zip chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.tar.gz chromium_src-151193028c0a4e5a1dbabc6b373335c0117c5574.tar.bz2 | |
linux_aura: Compile ash into chrome.
[This is take three. I believe that I've now fixed all the static
initializers (including both files named debug_utils.cc that were
including <iostream>), the packaging failures, and the black border
on the app list as pointed out by mgiuca@.]
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/292443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 35ae9d3..99c997f 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -44,6 +44,8 @@ #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" @@ -53,7 +55,7 @@ #include <X11/extensions/Xrandr.h> #undef RootWindow #endif // defined(USE_X11) -#endif // defined(OS_CHROMEOS) + namespace ash { namespace { |