Chromium Code Reviews| Index: chrome/browser/fullscreen_aurax11.cc |
| diff --git a/chrome/browser/fullscreen_aurax11.cc b/chrome/browser/fullscreen_aurax11.cc |
| index b186c006919b73258a66ced6f39fc6d420f71da3..9b1f3f622cbc90f42b5afd0a5c0338f66e83ffd2 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 |
| @@ -23,3 +33,4 @@ bool IsFullScreenMode() { |
| views::Widget::GetWidgetForNativeWindow(all_windows[0]); |
| return widget && widget->IsFullscreen(); |
| } |
| + |
|
sky
2014/04/24 23:14:32
nit: remove empty line.
|