Undocks window first before side-snapping bounds

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 823 matching lines @@
       return true;
     case LAUNCH_APP_7:
       Launcher::ForPrimaryDisplay()->LaunchAppIndexAt(7);
       return true;
     case LAUNCH_LAST_APP:
       Launcher::ForPrimaryDisplay()->LaunchAppIndexAt(-1);
       return true;
     case WINDOW_SNAP_LEFT:
     case WINDOW_SNAP_RIGHT: {
       wm::WindowState* window_state = wm::GetActiveWindowState();
-      // Disable window docking shortcut key for full screen window due to
+      // Disable window snapping shortcut key for full screen window due to
       // http://crbug.com/135487.
       if (!window_state ||
           window_state->window()->type() != aura::client::WINDOW_TYPE_NORMAL ||
           window_state->IsFullscreen()) {
         break;
       }
 
       internal::SnapSizer::SnapWindow(window_state,
           action == WINDOW_SNAP_LEFT ? internal::SnapSizer::LEFT_EDGE :
                                        internal::SnapSizer::RIGHT_EDGE);
       return true;
     }
     case WINDOW_MINIMIZE:
       return accelerators::ToggleMinimized();
     case TOGGLE_FULLSCREEN: {
       if (key_code == ui::VKEY_MEDIA_LAUNCH_APP2) {
         shell->delegate()->RecordUserMetricsAction(
             UMA_ACCEL_FULLSCREEN_F4);
       }
       accelerators::ToggleFullscreen();
       return true;
     }
     case TOGGLE_MAXIMIZED: {
       accelerators::ToggleMaximized();
       return true;
     }
     case WINDOW_POSITION_CENTER: {
       aura::Window* window = wm::GetActiveWindow();
-      if (window) {
+      // Centering a window does not maintain state and state change
+      // notifications are not sent. Disable centering for docked windows.
+      if (window && !wm::GetWindowState(window)->IsDocked()) {
+        wm::GetWindowState(window)->SetWindowShowTypeUnsnapped();
         wm::CenterWindow(window);
         return true;
       }
       break;
     }
     case SCALE_UI_UP:
       return HandleScaleUI(true /* up */);
     case SCALE_UI_DOWN:
       return HandleScaleUI(false /* down */);
     case SCALE_UI_RESET:
@@ skipping 111 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash