Index: ash/wm/dock/docked_window_layout_manager.h |
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h |
index c5ef46959bd72373a66ce5f37e05ab5d9f4497d6..28c81fccd7bb6095f952c6345dcc4bee4e03ba4d 100644 |
--- a/ash/wm/dock/docked_window_layout_manager.h |
+++ b/ash/wm/dock/docked_window_layout_manager.h |
@@ -103,6 +103,10 @@ class ASH_EXPORT DockedWindowLayoutManager |
virtual void OnWindowPropertyChanged(aura::Window* window, |
const void* key, |
intptr_t old) OVERRIDE; |
+ virtual void OnWindowBoundsChanged(aura::Window* window, |
+ const gfx::Rect& old_bounds, |
+ const gfx::Rect& new_bounds) OVERRIDE; |
+ virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; |
// aura::client::ActivationChangeObserver: |
virtual void OnWindowActivated(aura::Window* gained_active, |
@@ -174,6 +178,10 @@ class ASH_EXPORT DockedWindowLayoutManager |
// Side of the screen that the dock is positioned at. |
DockedAlignment alignment_; |
+ // The last active window. Used to maintain stacking order even if no windows |
+ // are currently focused. |
+ aura::Window* last_active_window_; |
+ |
// Observers of dock bounds changes. |
ObserverList<DockedWindowLayoutManagerObserver> observer_list_; |