diff options
Diffstat (limited to 'chrome/browser/views/options/content_page_view.cc')
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index bb70905..510976a 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -56,7 +56,7 @@ class FileDisplayArea : public ChromeViews::View { // ChromeViews::View overrides: virtual void Paint(ChromeCanvas* canvas); virtual void Layout(); - virtual void GetPreferredSize(CSize* out); + virtual gfx::Size GetPreferredSize(); protected: // ChromeViews::View overrides: @@ -111,19 +111,17 @@ void FileDisplayArea::Paint(ChromeCanvas* canvas) { void FileDisplayArea::Layout() { icon_bounds_.SetRect(kFileIconHorizontalSpacing, kFileIconVerticalSpacing, kFileIconSize, kFileIconSize); - CSize ps; - text_field_->GetPreferredSize(&ps); + gfx::Size ps = text_field_->GetPreferredSize(); text_field_->SetBounds(icon_bounds_.right() + kFileIconTextFieldSpacing, - (height() - ps.cy) / 2, + (height() - ps.height()) / 2, width() - icon_bounds_.right() - kFileIconHorizontalSpacing - - kFileIconTextFieldSpacing, ps.cy); + kFileIconTextFieldSpacing, ps.height()); } -void FileDisplayArea::GetPreferredSize(CSize* out) { - DCHECK(out); - out->cx = kFileIconSize + 2 * kFileIconVerticalSpacing; - out->cy = kFileIconSize + 2 * kFileIconHorizontalSpacing; +gfx::Size FileDisplayArea::GetPreferredSize() { + return gfx::Size(kFileIconSize + 2 * kFileIconVerticalSpacing, + kFileIconSize + 2 * kFileIconHorizontalSpacing); } void FileDisplayArea::ViewHierarchyChanged(bool is_add, |