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, 10 insertions, 19 deletions

diff --git a/app/os_exchange_data_provider_gtk.cc b/app/os_exchange_data_provider_gtk.cc
index dbae20e..db4c249 100644
--- a/app/os_exchange_data_provider_gtk.cc
+++ b/app/os_exchange_data_provider_gtk.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.
 
@@ -17,17 +17,13 @@ OSExchangeDataProviderGtk::OSExchangeDataProviderGtk(
     : known_formats_(known_formats),
       known_custom_formats_(known_custom_formats),
       formats_(0),
-      drag_image_(NULL),
-      cursor_offset_x_(0),
-      cursor_offset_y_(0) {
+      drag_image_(NULL) {
 }
 
 OSExchangeDataProviderGtk::OSExchangeDataProviderGtk()
     : known_formats_(0),
       formats_(0),
-      drag_image_(NULL),
-      cursor_offset_x_(0),
-      cursor_offset_y_(0) {
+      drag_image_(NULL) {
 }
 
 OSExchangeDataProviderGtk::~OSExchangeDataProviderGtk() {
@@ -227,14 +223,12 @@ bool OSExchangeDataProviderGtk::GetPlainTextURL(GURL* url) const {
 }
 
 void OSExchangeDataProviderGtk::SetDragImage(GdkPixbuf* drag_image,
-                                             int cursor_offset_x,
-                                             int cursor_offset_y) {
+                                             const gfx::Point& cursor_offset) {
   if (drag_image_)
     g_object_unref(drag_image_);
   g_object_ref(drag_image);
   drag_image_ = drag_image;
-  cursor_offset_x_ = cursor_offset_x;
-  cursor_offset_y_ = cursor_offset_y;
+  cursor_offset_ = cursor_offset;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/app/os_exchange_data_provider_gtk.h b/app/os_exchange_data_provider_gtk.h
index 9a56a2d..a53957d 100644
--- a/app/os_exchange_data_provider_gtk.h
+++ b/app/os_exchange_data_provider_gtk.h
@@ -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.
 
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "app/os_exchange_data.h"
+#include "base/gfx/point.h"
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
@@ -71,12 +72,9 @@ class OSExchangeDataProviderGtk : public OSExchangeData::Provider {
 
   // Set the image and cursor offset data for this drag.  Will
   // increment the ref count of pixbuf.
-  void SetDragImage(GdkPixbuf* pixbuf,
-                    int cursor_offset_x,
-                    int cursor_offset_y);
+  void SetDragImage(GdkPixbuf* pixbuf, const gfx::Point& cursor_offset);
   GdkPixbuf* drag_image() const { return drag_image_; }
-  int cursor_offset_x() const { return cursor_offset_x_; }
-  int cursor_offset_y() const { return cursor_offset_y_; }
+  gfx::Point cursor_offset() const { return cursor_offset_; }
 
  private:
   typedef std::map<OSExchangeData::CustomFormat, Pickle>  PickleData;
@@ -110,8 +108,7 @@ class OSExchangeDataProviderGtk : public OSExchangeData::Provider {
 
   // Drag image and offset data.
   GdkPixbuf* drag_image_;
-  int cursor_offset_x_;
-  int cursor_offset_y_;
+  gfx::Point cursor_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderGtk);
 };