Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 991f1eb2127d6ced2657b9058acbffc9d6083d42..197a968aee4ab7c4aa38e309c28759b45dcc9c66 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -35,6 +35,7 @@ |
#include "ash/wm/system_modal_container_layout_manager.h" |
#include "ash/wm/toplevel_window_event_handler.h" |
#include "ash/wm/window_properties.h" |
+#include "ash/wm/window_util.h" |
#include "ash/wm/workspace_controller.h" |
#include "base/command_line.h" |
#include "base/time.h" |
@@ -459,14 +460,14 @@ void RootWindowController::UpdateShelfVisibility() { |
shelf_->shelf_layout_manager()->UpdateVisibilityState(); |
} |
-bool RootWindowController::IsImmersiveMode() const { |
+aura::Window* RootWindowController::GetFullscreenWindow() const { |
aura::Window* container = workspace_controller_->GetActiveWorkspaceWindow(); |
for (size_t i = 0; i < container->children().size(); ++i) { |
aura::Window* child = container->children()[i]; |
- if (child->IsVisible() && child->GetProperty(kImmersiveModeKey)) |
- return true; |
+ if (ash::wm::IsWindowFullscreen(child)) |
+ return child; |
} |
- return false; |
+ return NULL; |
} |
void RootWindowController::InitKeyboard() { |