Convert GetPreferredSize from:...

chrome/browser/find_in_page_controller.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/find_in_page_controller.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_in_page_view.h"
 #include "chrome/browser/find_notification_details.h"
@@ skipping 544 matching lines @@
 
 gfx::Rect FindInPageController::GetDialogPosition(
     gfx::Rect avoid_overlapping_rect) {
   // Find the area we have to work with (after accounting for scrollbars, etc).
   gfx::Rect dialog_bounds;
   GetDialogBounds(&dialog_bounds);
   if (dialog_bounds.IsEmpty())
     return gfx::Rect();
 
   // Ask the view how large an area it needs to draw on.
-  CSize prefsize;
-  view_->GetPreferredSize(&prefsize);
+  gfx::Size prefsize = view_->GetPreferredSize();
 
   // Place the view in the top right corner of the dialog boundaries (top left
   // for RTL languages).
   gfx::Rect view_location;
   int x = view_->UILayoutIsRightToLeft() ?
-              dialog_bounds.x() : dialog_bounds.width() - prefsize.cx;
+              dialog_bounds.x() : dialog_bounds.width() - prefsize.width();
   int y = dialog_bounds.y();
-  view_location.SetRect(x, y, prefsize.cx, prefsize.cy);
+  view_location.SetRect(x, y, prefsize.width(), prefsize.height());
 
   // Make sure we don't go out of bounds to the left (right in RTL) if the
   // window is too small to fit our dialog.
   if (view_->UILayoutIsRightToLeft()) {
-    int boundary = dialog_bounds.width() - prefsize.cx;
+    int boundary = dialog_bounds.width() - prefsize.width();
     view_location.set_x(std::min(view_location.x(), boundary));
   } else {
     view_location.set_x(std::max(view_location.x(), dialog_bounds.x()));
   }
 
   gfx::Rect new_pos = view_location;
 
   // When we get Find results back, we specify a selection rect, which we
   // should strive to avoid overlapping. But first, we need to offset the
   // selection rect (if one was provided).
@@ skipping 94 matching lines @@
   // TODO(finnur): Once we fix issue 1307173 we should not remember any old
   // accelerator targets and just Register and Unregister when needed.
   DCHECK(old_accel_target_for_esc_ != NULL);
   ChromeViews::Accelerator escape(VK_ESCAPE, false, false, false);
   ChromeViews::AcceleratorTarget* current_target =
       focus_manager_->GetTargetForAccelerator(escape);
   if (current_target == this)
     focus_manager_->RegisterAccelerator(escape, old_accel_target_for_esc_);
 }