Avoids centering docked windows, Unsnaps when centering.

ash/wm/window_util.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/window_util.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
+#include "ash/wm/window_state.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/window_util.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 26 matching lines @@
 bool CanActivateWindow(aura::Window* window) {
   return views::corewm::CanActivateWindow(window);
 }
 
 bool IsWindowMinimized(aura::Window* window) {
   return window->GetProperty(aura::client::kShowStateKey) ==
       ui::SHOW_STATE_MINIMIZED;
 }
 
 void CenterWindow(aura::Window* window) {
+  wm::WindowState* window_state = wm::GetWindowState(window);
+  if (!window_state->IsNormalShowState())
+    return;
   const gfx::Display display =
       Shell::GetScreen()->GetDisplayNearestWindow(window);
   gfx::Rect center = display.work_area();
-  center.ClampToCenteredSize(window->bounds().size());
-  window->SetBoundsInScreen(center, display);
+  gfx::Size size = window_state->HasRestoreBounds() ?
+      window_state->GetRestoreBoundsInScreen().size() :
+      window->bounds().size();
+  center.ClampToCenteredSize(size);
+  window_state->SetRestoreBoundsInScreen(center);
+  window_state->Restore();
 }
 
 void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& visible_area,
                                                  gfx::Rect* bounds) {
   AdjustBoundsToEnsureWindowVisibility(
       visible_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
 }
 
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           int min_width,
@@ skipping 41 matching lines @@
 }
 
 void ReparentTransientChildrenOfChild(aura::Window* window,
                                       aura::Window* child) {
   for (size_t i = 0; i < child->transient_children().size(); ++i)
     ReparentChildWithTransientChildren(window, child->transient_children()[i]);
 }
 
 }  // namespace wm
 }  // namespace ash