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 d037a76c5588ed9b09530a388f4e63a7ea32c376..c441524d1e5329e09d026f84867ab1af2bc2fd77 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -75,6 +75,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);
 }