diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 23:04:41 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 23:04:41 +0000 |
| commit | c72275dc6492eed399515a341ba17641fe6c798e (patch) | |
| tree | de6207a2139df8f4708b39c364180affe3dc0183 /chrome/browser/fullscreen_aurax11.cc | |
| parent | f06b05978f9fe04dbf3ca754d8f2f01270690efe (diff) | |
| download | chromium_src-c72275dc6492eed399515a341ba17641fe6c798e.zip chromium_src-c72275dc6492eed399515a341ba17641fe6c798e.tar.gz chromium_src-c72275dc6492eed399515a341ba17641fe6c798e.tar.bz2 | |
Revert 269892 "linux_aura: Compile ash into chrome."
Major regression in chrome-si/initializers. Reverting for now to fix.
> linux_aura: Compile ash into chrome.
>
> 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
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/25108005
TBR=erg@chromium.org
Review URL: https://codereview.chromium.org/276773004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fullscreen_aurax11.cc')
| -rw-r--r-- | chrome/browser/fullscreen_aurax11.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/fullscreen_aurax11.cc b/chrome/browser/fullscreen_aurax11.cc index eca8c22..b186c00 100644 --- a/chrome/browser/fullscreen_aurax11.cc +++ b/chrome/browser/fullscreen_aurax11.cc @@ -6,21 +6,11 @@ #include <vector> -#include "ash/root_window_controller.h" -#include "chrome/browser/ui/host_desktop.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #include "ui/views/widget/widget.h" bool IsFullScreenMode() { -#if defined(USE_ASH) - if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { - ash::RootWindowController* controller = - ash::RootWindowController::ForTargetRootWindow(); - return controller && controller->GetWindowForFullscreenMode(); - } -#endif - std::vector<aura::Window*> all_windows = views::DesktopWindowTreeHostX11::GetAllOpenWindows(); // Only the topmost window is checked. This works fine in the most cases, but |