diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 18:02:30 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 18:02:30 +0000 |
| commit | 154f8bcac65142d7ae6733204c15ae52cfa320c6 (patch) | |
| tree | d7375c1119946c2914ee79ef2c0e8aa195b1fbe9 /chrome/views/message_box_view.cc | |
| parent | 8144d0cea4e142ff7d7a75c84240a4bb8a7fb3a4 (diff) | |
| download | chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.zip chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.tar.gz chromium_src-154f8bcac65142d7ae6733204c15ae52cfa320c6.tar.bz2 | |
Convert GetPreferredSize from:
void GetPreferredSize(CSize* out);
to:
gfx::Size GetPreferredSize();
.. and update some other places to use gfx::Size as well.
http://crbug.com/2186
Review URL: http://codereview.chromium.org/7344
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/message_box_view.cc')
| -rw-r--r-- | chrome/views/message_box_view.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/views/message_box_view.cc b/chrome/views/message_box_view.cc index fbc6d32..bf2ac5f 100644 --- a/chrome/views/message_box_view.cc +++ b/chrome/views/message_box_view.cc @@ -119,9 +119,9 @@ void MessageBoxView::ResetLayoutManager() { GridLayout* layout = CreatePanelGridLayout(this); SetLayoutManager(layout); - CSize icon_size; + gfx::Size icon_size; if (icon_) - icon_->GetPreferredSize(&icon_size); + icon_size = icon_->GetPreferredSize(); // Add the column set for the message displayed at the top of the dialog box. // And an icon, if one has been set. @@ -129,7 +129,8 @@ void MessageBoxView::ResetLayoutManager() { ColumnSet* column_set = layout->AddColumnSet(message_column_view_set_id); if (icon_) { column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0, - GridLayout::FIXED, icon_size.cx, icon_size.cy); + GridLayout::FIXED, icon_size.width(), + icon_size.height()); column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing); } column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, @@ -141,7 +142,7 @@ void MessageBoxView::ResetLayoutManager() { column_set = layout->AddColumnSet(textfield_column_view_set_id); if (icon_) { column_set->AddPaddingColumn(0, - icon_size.cx + kUnrelatedControlHorizontalSpacing); + icon_size.width() + kUnrelatedControlHorizontalSpacing); } column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, GridLayout::USE_PREF, 0, 0); @@ -153,7 +154,7 @@ void MessageBoxView::ResetLayoutManager() { column_set = layout->AddColumnSet(checkbox_column_view_set_id); if (icon_) { column_set->AddPaddingColumn(0, - icon_size.cx + kUnrelatedControlHorizontalSpacing); + icon_size.width() + kUnrelatedControlHorizontalSpacing); } column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, GridLayout::USE_PREF, 0, 0); |