ash: Refactor some code that snaps windows.

ash/wm/gestures/system_pinch_handler.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/gestures/system_pinch_handler.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
@@ skipping 65 matching lines @@
         phantom_.Show(bounds, NULL);
       break;
     }
 
     case ui::ET_GESTURE_MULTIFINGER_SWIPE: {
       phantom_.Hide();
       pinch_factor_ = 1.0;
       phantom_state_ = PHANTOM_WINDOW_NORMAL;
 
       if (event.details().swipe_left() || event.details().swipe_right()) {
-        // Snap for left/right swipes. In case the window is
-        // maximized/fullscreen, then restore the window first so that tiling
-        // works correctly.
-        if (wm::IsWindowMaximized(target_) ||
-            wm::IsWindowFullscreen(target_))
-          wm::RestoreWindow(target_);
-
+        // Snap for left/right swipes.
         ui::ScopedLayerAnimationSettings settings(
             target_->layer()->GetAnimator());
-        SnapSizer sizer(target_,
-            gfx::Point(),
+        wm::SnapWindow(target_,
             event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE :
-                                           internal::SnapSizer::RIGHT_EDGE,
-            internal::SnapSizer::OTHER_INPUT);
-        target_->SetBounds(sizer.GetSnapBounds(target_->bounds()));
+                                           internal::SnapSizer::RIGHT_EDGE);
       } else if (event.details().swipe_up()) {
         if (!wm::IsWindowMaximized(target_) &&
             !wm::IsWindowFullscreen(target_))
           wm::MaximizeWindow(target_);
       } else if (event.details().swipe_down()) {
         wm::MinimizeWindow(target_);
       } else {
         NOTREACHED() << "Swipe happened without a direction.";
       }
       break;
@@ skipping 35 matching lines @@
     phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
     return rect;
   }
 
   phantom_state_ = PHANTOM_WINDOW_NORMAL;
   return window->bounds();
 }
 
 }  // namespace internal
 }  // namespace ash