Not moving a docked window when restoring a previously maximized window

ash/wm/panels/panel_frame_view.cc

 // Copyright (c) 2012 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/panels/panel_frame_view.h"
 
 #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"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 53 matching lines @@
       NonClientTopBorderHeight() + min_client_view_size.height());
 }
 
 void PanelFrameView::Layout() {
   if (!header_painter_)
     return;
   header_painter_->LayoutHeader(true);
   header_painter_->set_header_height(NonClientTopBorderHeight());
 }
 
+void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
+  // Nothing.
+}
+
 void PanelFrameView::ResetWindowControls() {
   NOTIMPLEMENTED();
 }
 
 void PanelFrameView::UpdateWindowIcon() {
   if (!window_icon_)
     return;
   views::WidgetDelegate* delegate = frame_->widget_delegate();
   if (delegate)
     window_icon_->SetImage(delegate->GetWindowIcon());
   window_icon_->SchedulePaint();
 }
 
 void PanelFrameView::UpdateWindowTitle() {
   if (!header_painter_)
     return;
   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) {
   if (!header_painter_)
     return HTNOWHERE;
   return FrameBorderHitTestController::NonClientHitTest(this,
       header_painter_.get(), point);
 }
 
 void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
@@ skipping 26 matching lines @@
 
 gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   if (!header_painter_)
     return client_bounds;
   return HeaderPainter::GetWindowBoundsForClientBounds(
       NonClientTopBorderHeight(), client_bounds);
 }
 
 }  // namespace ash