Do not send the OnWindowShowTypeChanged() notification if the show type has not changed

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/screen_ash.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"
@@ skipping 35 matching lines @@
       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();
-  gfx::Size size = window_state->HasRestoreBounds() ?
-      window_state->GetRestoreBoundsInScreen().size() :
-      window->bounds().size();
-  center.ClampToCenteredSize(size);
-  window_state->SetRestoreBoundsInScreen(center);
-  window_state->Restore();
+  gfx::Size size = window->bounds().size();
+  if (window_state->IsSnapped()) {
+    if (window_state->HasRestoreBounds())
+      size = window_state->GetRestoreBoundsInScreen().size();
+    center.ClampToCenteredSize(size);
+    window_state->SetRestoreBoundsInScreen(center);
+    window_state->Restore();
+  } else {
+    center = ScreenAsh::ConvertRectFromScreen(window->parent(),
+        center);
+    center.ClampToCenteredSize(size);
+    window->SetBounds(center);
+  }
 }
 
 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