Replace lots of "int x, int y" with gfx::Point. Also use gfx::Size and gfx::Rect in a few more places.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/669130

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40966 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 8 deletions

diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index ef594c8..bccf9a1 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -546,13 +546,12 @@ enum ScrollBarContextMenuCommands {
 };
 
 void BitmapScrollBar::ShowContextMenu(View* source,
-                                      int x,
-                                      int y,
+                                      const gfx::Point& p,
                                       bool is_mouse_gesture) {
   Widget* widget = GetWidget();
   gfx::Rect widget_bounds;
   widget->GetBounds(&widget_bounds, true);
-  gfx::Point temp_pt(x - widget_bounds.x(), y - widget_bounds.y());
+  gfx::Point temp_pt(p.x() - widget_bounds.x(), p.y() - widget_bounds.y());
   View::ConvertPointFromWidget(this, &temp_pt);
   context_menu_mouse_position_ = IsHorizontal() ? temp_pt.x() : temp_pt.y();
 
@@ -568,7 +567,7 @@ void BitmapScrollBar::ShowContextMenu(View* source,
   menu->AppendSeparator();
   menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollPrev);
   menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollNext);
-  menu->RunMenuAt(x, y);
+  menu->RunMenuAt(p.x(), p.y());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.h b/views/controls/scrollbar/bitmap_scroll_bar.h
index cb6603b..9a22a2e 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.h
+++ b/views/controls/scrollbar/bitmap_scroll_bar.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -114,8 +114,7 @@ class BitmapScrollBar : public ScrollBar,
 
   // ContextMenuController overrides.
   virtual void ShowContextMenu(View* source,
-                               int x,
-                               int y,
+                               const gfx::Point& p,
                                bool is_mouse_gesture);
 
   // Menu::Delegate overrides: