Convert GetPreferredSize from:...

chrome/browser/drag_utils.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/drag_utils.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
@@ skipping 131 matching lines @@
   // Create a button to render the drag image for us.
   ChromeViews::TextButton button(
       title.empty() ? UTF8ToWide(url.spec()) : title);
   button.set_max_width(BookmarkBarView::kMaxButtonWidth);
   if (icon.isNull()) {
     button.SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
                    IDR_DEFAULT_FAVICON));
   } else {
     button.SetIcon(icon);
   }
-  CSize pref;
-  button.GetPreferredSize(&pref);
-  button.SetBounds(0, 0, pref.cx, pref.cy);
+  gfx::Size prefsize = button.GetPreferredSize();
+  button.SetBounds(gfx::Point(), prefsize);
 
   // Render the image.
-  ChromeCanvas canvas(pref.cx, pref.cy, false);
+  ChromeCanvas canvas(prefsize.width(), prefsize.height(), false);

[Elliot Glaysher, 2008/10/15 17:21:46]

Can ChromeCanvas take a gfx::Size?

[Ben Goodger (Google), 2008/10/15 17:37:32]

I looked at the users of Canvas. Most of them aren't using gfx::Size at the
moment. Upgrading Canvas would be a pretty large task. I could add the extra
ctor, but for one caller it doesn't seem worth it at the moment.

   button.Paint(&canvas, true);
-  SetDragImageOnDataObject(canvas, pref.cx, pref.cy, pref.cx / 2, pref.cy / 2,
+  SetDragImageOnDataObject(canvas, prefsize.width(), prefsize.height(),
+                           prefsize.width() / 2, prefsize.height() / 2,
                            data);
 }
 
 void CreateDragImageForFile(const std::wstring& file_name,
                             SkBitmap* icon,
                             IDataObject* data_object) {
   DCHECK(icon);
   DCHECK(data_object);
 
   // Set up our text portion
@@ skipping 29 matching lines @@
 
   // Attach 'bitmap' to the data_object.
   SetDragImageOnDataObject(bitmap, width, height,
                            cursor_x_offset,
                            cursor_y_offset,
                            data_object);
 }
 
 } // namespace drag_utils