Not moving a docked window when restoring a previously maximized window

ash/wm/window_state.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/window_state.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
@@ skipping 57 matching lines @@
 
 bool WindowState::IsNormalShowState() const {
   ui::WindowShowState state = window_->GetProperty(aura::client::kShowStateKey);
   return state == ui::SHOW_STATE_NORMAL || state == ui::SHOW_STATE_DEFAULT;
 }
 
 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);
 }
 
 bool WindowState::CanMinimize() const {
   internal::RootWindowController* controller =
       internal::RootWindowController::ForWindow(window_);
   if (!controller)
     return false;
   aura::Window* lockscreen = controller->GetContainer(
@@ skipping 183 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash