Index: ash/common/wm/dock/docked_window_layout_manager.h |
diff --git a/ash/common/wm/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h |
index d1d0bf83cf0110469a0b25351a2aef9d186d150b..09af9b2ce73453537995b9264595c50278deeaca 100644 |
--- a/ash/common/wm/dock/docked_window_layout_manager.h |
+++ b/ash/common/wm/dock/docked_window_layout_manager.h |
@@ -8,6 +8,7 @@ |
#include <memory> |
#include "ash/ash_export.h" |
+#include "ash/common/shell_observer.h" |
#include "ash/common/wm/dock/dock_types.h" |
#include "ash/common/wm/dock/docked_window_layout_manager_observer.h" |
#include "ash/common/wm/window_state_observer.h" |
@@ -47,6 +48,7 @@ class ASH_EXPORT DockedWindowLayoutManager |
public WmRootWindowControllerObserver, |
public WmWindowObserver, |
public WmActivationObserver, |
+ public ShellObserver, |
public keyboard::KeyboardControllerObserver, |
public wm::WindowStateObserver { |
public: |
@@ -154,6 +156,13 @@ class ASH_EXPORT DockedWindowLayoutManager |
void OnWindowActivated(WmWindow* gained_active, |
WmWindow* lost_active) override; |
+ // ShellObserver: |
+ void OnShelfAlignmentChanged(WmWindow* root_window) override; |
+ void OnFullscreenStateChanged(bool is_fullscreen, |
+ WmWindow* root_window) override; |
+ void OnOverviewModeStarting() override; |
+ void OnOverviewModeEnded() override; |
+ |
private: |
struct CompareMinimumHeight; |
struct CompareWindowPos; |
@@ -277,6 +286,9 @@ class ASH_EXPORT DockedWindowLayoutManager |
// Target bounds of a docked window being dragged. |
gfx::Rect dragged_bounds_; |
+ // True while in overview mode. |
+ bool in_overview_; |
+ |
// Side of the screen that the dock is positioned at. |
DockedAlignment alignment_; |