| 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
|
|
|