ash: Refactor some code that snaps windows.

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 <string>
 
@@ skipping 692 matching lines @@
     case WINDOW_SNAP_RIGHT: {
       aura::Window* window = wm::GetActiveWindow();
       // Disable window docking shortcut key for full screen window due to
       // http://crbug.com/135487.
       if (!window ||
           window->type() != aura::client::WINDOW_TYPE_NORMAL ||
           wm::IsWindowFullscreen(window)) {
         break;
       }
 
-      internal::SnapSizer sizer(window,
-          gfx::Point(),
+      internal::SnapSizer::SnapWindow(window,
           action == WINDOW_SNAP_LEFT ? internal::SnapSizer::LEFT_EDGE :
-                                       internal::SnapSizer::RIGHT_EDGE,
-          internal::SnapSizer::OTHER_INPUT);
-      if (wm::IsWindowFullscreen(window) ||
-          wm::IsWindowMaximized(window)) {
-        // Before we can set the bounds we need to restore the window.
-        // Restoring the window will set the window to its restored bounds.
-        // To avoid an unnecessary bounds changes (which may have side effects)
-        // we set the restore bounds to the bounds we want, restore the window,
-        // then reset the restore bounds. This way no unnecessary bounds
-        // changes occurs and the original restore bounds is remembered.
-        gfx::Rect restore = *GetRestoreBoundsInScreen(window);
-        SetRestoreBoundsInParent(window, sizer.GetSnapBounds(window->bounds()));
-        wm::RestoreWindow(window);
-        SetRestoreBoundsInScreen(window, restore);
-      } else {
-        window->SetBounds(sizer.GetSnapBounds(window->bounds()));
-      }
+                                       internal::SnapSizer::RIGHT_EDGE);
       return true;
     }
     case WINDOW_MINIMIZE: {
       aura::Window* window = wm::GetActiveWindow();
       // Attempt to restore the window that would be cycled through next from
       // the launcher when there is no active window.
       if (!window)
         return HandleCycleWindowMRU(WindowCycleController::FORWARD, false);
       // Disable the shortcut for minimizing full screen window due to
       // crbug.com/131709, which is a crashing issue related to minimizing
@@ skipping 151 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash