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

Unified Diff: chrome/browser/fullscreen_aura.cc

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos link Created 7 years, 3 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_aura.cc
diff --git a/chrome/browser/fullscreen_aura.cc b/chrome/browser/fullscreen_aura.cc
index db768be178966df02069263de50eeea8f9595aeb..ee0bb2417ab4a07c47ceeb78dd40b068e0145382 100644
--- a/chrome/browser/fullscreen_aura.cc
+++ b/chrome/browser/fullscreen_aura.cc
@@ -6,9 +6,20 @@
#include "base/logging.h"
-#if !defined(USE_ASH)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
sky 2013/09/30 14:45:53 Since you're in effect conditionally compiling thi
+
+#include "ash/root_window_controller.h"
+#include "chrome/browser/ui/host_desktop.h"
bool IsFullScreenMode() {
+#if defined(USE_ASH)
+ if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
+ ash::internal::RootWindowController* controller =
+ ash::internal::RootWindowController::ForTargetRootWindow();
+ return controller && controller->GetTopmostFullscreenWindow();
+ }
+#endif
+
// TODO(erg): An implementation here would have to check all existing
// RootWindows instead of just recursively walking the Shell's RootWindow as
// in the ash implementaiton.
@@ -16,4 +27,4 @@ bool IsFullScreenMode() {
return false;
}
-#endif
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698