Not moving a docked window when restoring a previously maximized window

ash/wm/window_state.cc

Index: ash/wm/window_state.cc
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index 1aade08d89d2feb9c3df9cb3be9502711279c64e..74b0f0666096d2c115b19849ea886a1daa6dc485 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -74,6 +74,11 @@ bool WindowState::IsActive() const {
   return IsActiveWindow(window_);
 }
 
+bool WindowState::IsDocked() const {
+  return window_->parent() &&
+      window_->parent()->id() == internal::kShellWindowId_DockedContainer;
+}
+
 bool WindowState::CanMaximize() const {
   return window_->GetProperty(aura::client::kCanMaximizeKey);
 }