Not moving a docked window when restoring a previously maximized window

ash/wm/custom_frame_view_ash.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/custom_frame_view_ash.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/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
@@ skipping 64 matching lines @@
   caption_button_container_->ResetWindowControls();
 }
 
 void CustomFrameViewAsh::UpdateWindowIcon() {
 }
 
 void CustomFrameViewAsh::UpdateWindowTitle() {
   header_painter_->SchedulePaintForTitle(GetTitleFont());
 }
 
+bool CustomFrameViewAsh::IsDocked() const {
+  return ash::wm::GetWindowState(frame_->GetNativeWindow())->IsDocked();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::View overrides:
 
 gfx::Size CustomFrameViewAsh::GetPreferredSize() {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()->GetWindowBoundsForClientBounds(
       bounds).size();
 }
 
@@ skipping 54 matching lines @@
   if (frame_->IsFullscreen())
     return 0;
 
   // Reserve enough space to see the buttons, including any offset from top and
   // reserving space for the separator line.
   return caption_button_container_->bounds().bottom() +
       header_painter_->HeaderContentSeparatorSize();
 }
 
 }  // namespace ash