diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 22:41:47 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 22:41:47 +0000 |
| commit | 10506308ee11a4130fe535139bb9b08f678969da (patch) | |
| tree | 0b63d4cc4c2b8c42aee868db4df358404606394b /chrome/browser/fullscreen_aurax11.cc | |
| parent | 5aba5bc9fe839dce4e580e042cd6f53cdc963deb (diff) | |
| download | chromium_src-10506308ee11a4130fe535139bb9b08f678969da.zip chromium_src-10506308ee11a4130fe535139bb9b08f678969da.tar.gz chromium_src-10506308ee11a4130fe535139bb9b08f678969da.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270232 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, 10 insertions, 0 deletions
diff --git a/chrome/browser/fullscreen_aurax11.cc b/chrome/browser/fullscreen_aurax11.cc index b186c00..eca8c22 100644 --- a/chrome/browser/fullscreen_aurax11.cc +++ b/chrome/browser/fullscreen_aurax11.cc @@ -6,11 +6,21 @@ #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 |