1 files changed, 24 insertions, 22 deletions

diff --git a/chrome/browser/views/delay_view.cc b/chrome/browser/views/delay_view.cc
index cdd5a9c..76c8322 100644
--- a/chrome/browser/views/delay_view.cc
+++ b/chrome/browser/views/delay_view.cc
@@ -54,36 +54,38 @@ void DelayView::Layout() {
   GetParent()->GetSize(&available);
 
   if (cancel_button_) {
-    CSize button_size;
-    cancel_button_->GetPreferredSize(&button_size);
-    cancel_button_->SetBounds(available.cx - kWindowMargin - button_size.cx,
-                              available.cy - kWindowMargin - button_size.cy,
-                              button_size.cx, button_size.cy);
+    gfx::Size button_size = cancel_button_->GetPreferredSize();
+    cancel_button_->SetBounds(available.cx - kWindowMargin -
+                                  button_size.width(),
+                              available.cy - kWindowMargin -
+                                  button_size.height(),
+                              button_size.width(), button_size.height());
   }
 
   DCHECK(label_);
-  CSize label_size;
-  label_->GetPreferredSize(&label_size);
+  gfx::Size label_size = label_->GetPreferredSize();
 
   DCHECK(throbber_);
-  CSize throbber_size;
-  throbber_->GetPreferredSize(&throbber_size);
+  gfx::Size throbber_size = throbber_->GetPreferredSize();
 
-  CRect main_rect(0, 0,
-                  throbber_size.cx + kThrobberLabelSpace + label_size.cx,
-                  std::max(throbber_size.cy, label_size.cy));
+  gfx::Rect main_rect(0, 0,
+                      throbber_size.width() + kThrobberLabelSpace +
+                          label_size.width(),
+                      std::max(throbber_size.height(), label_size.height()));
 
-  main_rect.MoveToXY((available.cx / 2) - (main_rect.Width() / 2),
-                     (available.cy / 2) - (main_rect.Height() / 2));
+  main_rect.set_x((available.cx / 2) - (main_rect.width() / 2));
+  main_rect.set_y((available.cy / 2) - (main_rect.height() / 2));
 
-  label_->SetBounds(main_rect.left + throbber_size.cx + kThrobberLabelSpace,
-                    main_rect.top + main_rect.Height() / 2 - label_size.cy / 2,
-                    label_size.cx,
-                    label_size.cy);
+  label_->SetBounds(main_rect.x() + throbber_size.width() +
+                        kThrobberLabelSpace,
+                    main_rect.y() + main_rect.height() / 2 -
+                        label_size.height() / 2,
+                    label_size.width(),
+                    label_size.height());
 
   throbber_->SetBounds(
-      main_rect.left,
-      main_rect.top + main_rect.Height() / 2 - throbber_size.cy / 2,
-      throbber_size.cx,
-      throbber_size.cy);
+      main_rect.x(),
+      main_rect.y() + main_rect.height() / 2 - throbber_size.height() / 2,
+      throbber_size.width(),
+      throbber_size.height());
 }