Index: ash/shelf/shelf_layout_manager.cc |
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
index e270547ced2087880f92e1c0f76aa52d94efcb00..10c6578dd22948f9cd0bec2207bd955949c85807 100644 |
--- a/ash/shelf/shelf_layout_manager.cc |
+++ b/ash/shelf/shelf_layout_manager.cc |
@@ -26,7 +26,6 @@ |
#include "ash/wm/lock_state_controller.h" |
#include "ash/wm/mru_window_tracker.h" |
#include "ash/wm/window_animations.h" |
-#include "ash/wm/window_properties.h" |
#include "ash/wm/window_state.h" |
#include "ash/wm/window_util.h" |
#include "ash/wm/workspace_controller.h" |
@@ -544,9 +543,8 @@ bool ShelfLayoutManager::FullscreenWithMinimalChrome() const { |
const aura::Window* window = controller->GetTopmostFullscreenWindow(); |
if (!window) |
return false; |
- if (!window->GetProperty(kFullscreenUsesMinimalChromeKey)) |
- return false; |
- return true; |
+ return wm::GetWindowState(window)->fullscreen_type() == |
+ wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME; |
oshima
2013/10/25 15:21:32
Is this only place this fullscreen type is used in
|
} |
// static |