diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 18:17:47 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 18:17:47 +0000 |
commit | 80f8b9f5cf620c37e9d1408a114dc90699584d89 (patch) | |
tree | 9e2f5fcacbb18cd86690bc47e0d22ea8f10ac317 /chrome/browser/views/delay_view.cc | |
parent | f377cebc8bb25bb9f6708adbfda567a95c296642 (diff) | |
download | chromium_src-80f8b9f5cf620c37e9d1408a114dc90699584d89.zip chromium_src-80f8b9f5cf620c37e9d1408a114dc90699584d89.tar.gz chromium_src-80f8b9f5cf620c37e9d1408a114dc90699584d89.tar.bz2 |
Make View::SetBounds take a const gfx::Rect& instead of a const CRect&
Make View::DidChangeBounds call Layout by default, eliminating this function from most places.
http://crbug.com/2186
Review URL: http://codereview.chromium.org/7429
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/delay_view.cc')
-rw-r--r-- | chrome/browser/views/delay_view.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/views/delay_view.cc b/chrome/browser/views/delay_view.cc index 76c8322..a841580 100644 --- a/chrome/browser/views/delay_view.cc +++ b/chrome/browser/views/delay_view.cc @@ -50,14 +50,13 @@ void DelayView::Layout() { if (!GetParent()) return; - CSize available; - GetParent()->GetSize(&available); + gfx::Size available = GetParent()->size(); if (cancel_button_) { gfx::Size button_size = cancel_button_->GetPreferredSize(); - cancel_button_->SetBounds(available.cx - kWindowMargin - + cancel_button_->SetBounds(available.width() - kWindowMargin - button_size.width(), - available.cy - kWindowMargin - + available.height() - kWindowMargin - button_size.height(), button_size.width(), button_size.height()); } @@ -73,8 +72,8 @@ void DelayView::Layout() { label_size.width(), std::max(throbber_size.height(), label_size.height())); - main_rect.set_x((available.cx / 2) - (main_rect.width() / 2)); - main_rect.set_y((available.cy / 2) - (main_rect.height() / 2)); + main_rect.set_x((available.width() / 2) - (main_rect.width() / 2)); + main_rect.set_y((available.height() / 2) - (main_rect.height() / 2)); label_->SetBounds(main_rect.x() + throbber_size.width() + kThrobberLabelSpace, |