Add Vector2d classes that represent offsets, instead of using Point.

ash/wm/workspace/frame_maximize_button.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/workspace/frame_maximize_button.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_bubble_controller.h"
@@ skipping 319 matching lines @@
   exceeded_drag_threshold_ = false;
   update_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
       this,
       &FrameMaximizeButton::UpdateSnapFromEventLocation);
 }
 
 void FrameMaximizeButton::ProcessUpdateEvent(const ui::LocatedEvent& event) {
   DCHECK(is_snap_enabled_);
-  int delta_x = event.x() - press_location_.x();
-  int delta_y = event.y() - press_location_.y();
   if (!exceeded_drag_threshold_) {
-    exceeded_drag_threshold_ =
-        views::View::ExceededDragThreshold(delta_x, delta_y);
+    exceeded_drag_threshold_ = views::View::ExceededDragThreshold(
+        event.location() - press_location_);
   }
   if (exceeded_drag_threshold_)
     UpdateSnap(event.location(), false);
 }
 
 bool FrameMaximizeButton::ProcessEndEvent(const ui::LocatedEvent& event) {
   update_timer_.Stop();
   UninstallEventFilter();
   bool should_snap = is_snap_enabled_;
   is_snap_enabled_ = false;
@@ skipping 87 matching lines @@
     phantom_window_->set_phantom_below_window(maximizer_->GetBubbleWindow());
     maximizer_->SetSnapType(snap_type_);
   }
   phantom_window_->Show(
       ScreenBoundsForType(snap_type_, *snap_sizer_.get()), NULL);
 }
 
 SnapType FrameMaximizeButton::SnapTypeForLocation(
     const gfx::Point& location) const {
   MaximizeBubbleFrameState maximize_type = GetMaximizeBubbleFrameState();
-  int delta_x = location.x() - press_location_.x();
-  int delta_y = location.y() - press_location_.y();
-  if (!views::View::ExceededDragThreshold(delta_x, delta_y))
+  gfx::Vector2d delta(location - press_location_);
+  if (!views::View::ExceededDragThreshold(delta))
     return maximize_type != FRAME_STATE_FULL ? SNAP_MAXIMIZE : SNAP_RESTORE;
-  else if (delta_x < 0 && delta_y > delta_x && delta_y < -delta_x)
+  else if (delta.x() < 0 && delta.y() > delta.x() && delta.y() < -delta.x())

[Peter Kasting, 2012/10/31 01:04:41]

Nit: While here, remove "else"s (no else after return)

[danakj, 2012/10/31 16:55:46]

Done.

     return maximize_type == FRAME_STATE_SNAP_LEFT ? SNAP_RESTORE : SNAP_LEFT;
-  else if (delta_x > 0 && delta_y > -delta_x && delta_y < delta_x)
+  else if (delta.x() > 0 && delta.y() > -delta.x() && delta.y() < delta.x())
     return maximize_type == FRAME_STATE_SNAP_RIGHT ? SNAP_RESTORE : SNAP_RIGHT;
-  else if (delta_y > 0)
+  else if (delta.y() > 0)
     return SNAP_MINIMIZE;
   return maximize_type != FRAME_STATE_FULL ? SNAP_MAXIMIZE : SNAP_RESTORE;
 }
 
 gfx::Rect FrameMaximizeButton::ScreenBoundsForType(
     SnapType type,
     const SnapSizer& snap_sizer) const {
   aura::Window* window = frame_->GetWidget()->GetNativeWindow();
   switch (type) {
     case SNAP_LEFT:
@@ skipping 106 matching lines @@
     return FRAME_STATE_SNAP_LEFT;
   if (bounds.right() == screen.right())
     return FRAME_STATE_SNAP_RIGHT;
   // If we come here, it is likely caused by the fact that the
   // "VerticalResizeDoubleClick" stored a restore rectangle. In that case
   // we allow all maximize operations (and keep the restore rectangle).
   return FRAME_STATE_NONE;
 }
 
 }  // namespace ash