Not moving a docked window when restoring a previously maximized window

ash/wm/custom_frame_view_ash.cc

Index: ash/wm/custom_frame_view_ash.cc
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index f03026c0ecdb8bdfab6e74c2da2ea055d4c19428..327af8afb95fd9d1e3c36fa627623c590d645a37 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.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/gfx/canvas.h"
 #include "ui/gfx/font.h"
@@ -91,6 +92,10 @@ void CustomFrameViewAsh::UpdateWindowTitle() {
   header_painter_->SchedulePaintForTitle(GetTitleFont());
 }
 
+bool CustomFrameViewAsh::IsDocked() const {
+  return ash::wm::GetWindowState(frame_->GetNativeWindow())->IsDocked();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::View overrides: