Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3999)

Unified Diff: chrome/browser/fullscreen_aurax11.cc

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698