Index: chrome/browser/fullscreen_aurax11.cc |
diff --git a/chrome/browser/fullscreen_aurax11.cc b/chrome/browser/fullscreen_aurax11.cc |
index b186c006919b73258a66ced6f39fc6d420f71da3..eca8c22bcd84854390bd4be86c5e3e8ba62390a7 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 |