Convert GetPreferredSize from:...

chrome/browser/views/first_run_view_base.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/views/first_run_view_base.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "base/thread.h"
@@ skipping 103 matching lines @@
                static_cast<int>(sub_view_bounds.right()) + kPanelHorizMargin);
 }
 
 void FirstRunViewBase::SetMinimumDialogWidth(int width) {
   preferred_width_ = std::max(preferred_width_, width);
 }
 
 void FirstRunViewBase::Layout() {
   const int kVertSpacing = 8;
 
-  CSize canvas;
-  GetPreferredSize(&canvas);
+  gfx::Size canvas = GetPreferredSize();
 
-  CSize pref_size;
-  background_image_->GetPreferredSize(&pref_size);
-  background_image_->SetBounds(0, 0, canvas.cx, pref_size.cy);
+  gfx::Size pref_size = background_image_->GetPreferredSize();
+  background_image_->SetBounds(0, 0, canvas.width(), pref_size.height());
 
   int next_v_space = background_image_->y() +
                      background_image_->height() - 2;
 
-  separator_1_->GetPreferredSize(&pref_size);
-  separator_1_->SetBounds(0 , next_v_space, canvas.cx + 1, pref_size.cy);
+  pref_size = separator_1_->GetPreferredSize();
+  separator_1_->SetBounds(0, next_v_space, canvas.width() + 1,
+                          pref_size.height());
 
-  next_v_space = canvas.cy - kPanelSubVerticalSpacing - 2 * kVertSpacing;
-  separator_2_->GetPreferredSize(&pref_size);
+  next_v_space = canvas.height() - kPanelSubVerticalSpacing - 2 * kVertSpacing;
+  pref_size = separator_2_->GetPreferredSize();
   separator_2_->SetBounds(kPanelHorizMargin , next_v_space,
-                          canvas.cx - 2 * kPanelHorizMargin, pref_size.cy);
+                          canvas.width() - 2 * kPanelHorizMargin,
+                          pref_size.height());
 
   next_v_space = separator_2_->y() + separator_2_->height() + kVertSpacing;
 
-  int width = canvas.cx - 2 * kPanelHorizMargin;
+  int width = canvas.width() - 2 * kPanelHorizMargin;
   int height = default_browser_->GetHeightForWidth(width);
   default_browser_->SetBounds(kPanelHorizMargin, next_v_space, width, height);
   AdjustDialogWidth(default_browser_);
 }
 
 bool FirstRunViewBase::CanResize() const {
   return false;
 }
 
 bool FirstRunViewBase::CanMaximize() const {
@@ skipping 39 matching lines @@
 }
 
 bool FirstRunViewBase::SetDefaultBrowser() {
   UserMetrics::RecordAction(L"FirstRun_Do_DefBrowser", profile_);
   return ShellIntegration::SetAsDefaultBrowser();
 }
 
 bool FirstRunViewBase::FirstRunComplete() {
   return FirstRun::CreateSentinel();
 }