Not moving a docked window when restoring a previously maximized window

ash/wm/panels/panel_frame_view.cc

Index: ash/wm/panels/panel_frame_view.cc
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 0a6bce5b0125b184fb54f91761cc22495d168ce9..f89eb6de5696efb7fc68d172d8a58a9c4bfd688c 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -7,6 +7,7 @@
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_border_hit_test_controller.h"
 #include "ash/wm/header_painter.h"
+#include "ash/wm/window_state.h"
 #include "grit/ash_resources.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -80,6 +81,10 @@ void PanelFrameView::Layout() {
   header_painter_->set_header_height(NonClientTopBorderHeight());
 }
 
+void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
+  // Nothing.
+}
+
 void PanelFrameView::ResetWindowControls() {
   NOTIMPLEMENTED();
 }
@@ -99,8 +104,8 @@ void PanelFrameView::UpdateWindowTitle() {
   header_painter_->SchedulePaintForTitle(title_font_);
 }
 
-void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
-  // Nothing.
+bool PanelFrameView::IsDocked() const {
+  return ash::wm::GetWindowState(frame_->GetNativeWindow())->IsDocked();
 }
 
 int PanelFrameView::NonClientHitTest(const gfx::Point& point) {