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

Unified Diff: chrome/browser/fullscreen_aura.cc

Issue 10081022: Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the check to ash/. Created 8 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
« no previous file with comments | « chrome/browser/fullscreen_ash.cc ('k') | chrome/browser/ui/tabs/dock_info_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/fullscreen_aura.cc
diff --git a/chrome/browser/fullscreen_aura.cc b/chrome/browser/fullscreen_aura.cc
index 08b141966dcf0e937ac37f767b0b42ee93a7e987..db768be178966df02069263de50eeea8f9595aeb 100644
--- a/chrome/browser/fullscreen_aura.cc
+++ b/chrome/browser/fullscreen_aura.cc
@@ -4,34 +4,16 @@
#include "chrome/browser/fullscreen.h"
-#include "ash/shell.h"
#include "base/logging.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-#include "ui/base/ui_base_types.h"
-namespace {
+#if !defined(USE_ASH)
-bool CheckIfFullscreenWindowExists(aura::Window* window) {
- if (window->GetProperty(aura::client::kShowStateKey) ==
- ui::SHOW_STATE_FULLSCREEN)
- return true;
- aura::Window::Windows children = window->children();
- for (aura::Window::Windows::const_iterator i = children.begin();
- i != children.end();
- ++i) {
- if (CheckIfFullscreenWindowExists(*i))
- return true;
- }
+bool IsFullScreenMode() {
+ // 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.
+ NOTIMPLEMENTED();
return false;
}
-} // namespace
-
-bool IsFullScreenMode() {
- // This is used only by notification_ui_manager.cc. On aura, notification
- // will be managed in panel. This is temporary to get certain feature running
- // until we implement it for aura.
- return CheckIfFullscreenWindowExists(ash::Shell::GetRootWindow());
-}
+#endif
« no previous file with comments | « chrome/browser/fullscreen_ash.cc ('k') | chrome/browser/ui/tabs/dock_info_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698