Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: chrome/browser/views/password_manager_view.cc

Issue 7344: Convert GetPreferredSize from:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/password_manager_view.cc
===================================================================
--- chrome/browser/views/password_manager_view.cc (revision 3391)
+++ chrome/browser/views/password_manager_view.cc (working copy)
@@ -36,21 +36,20 @@
pref_size_(-1, -1) {
}
-void MultiLabelButtons::GetPreferredSize(CSize *out) {
- if (pref_size_.cx == -1 && pref_size_.cy == -1) {
+gfx::Size MultiLabelButtons::GetPreferredSize() {
+ if (pref_size_.width() == -1 && pref_size_.height() == -1) {
// Let's compute our preferred size.
std::wstring current_label = GetLabel();
SetLabel(label_);
- NativeButton::GetPreferredSize(&pref_size_);
+ pref_size_ = NativeButton::GetPreferredSize();
SetLabel(alt_label_);
- CSize alt_pref_size;
- NativeButton::GetPreferredSize(&alt_pref_size);
+ gfx::Size alt_pref_size = NativeButton::GetPreferredSize();
// Revert to the original label.
SetLabel(current_label);
- pref_size_.cx = std::max(pref_size_.cx, alt_pref_size.cx);
- pref_size_.cy = std::max(pref_size_.cy, alt_pref_size.cy);
+ pref_size_.SetSize(std::max(pref_size_.width(), alt_pref_size.width()),
+ std::max(pref_size_.height(), alt_pref_size.height()));
}
- *out = pref_size_;
+ return gfx::Size(pref_size_.width(), pref_size_.height());
}
////////////////////////////////////////////////////////////////////
@@ -296,16 +295,14 @@
// the close button.
CRect parent_bounds;
GetParent()->GetLocalBounds(&parent_bounds, false);
- CSize prefsize;
- remove_all_button_.GetPreferredSize(&prefsize);
- int button_y = parent_bounds.bottom - prefsize.cy - kButtonVEdgeMargin;
- remove_all_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.cx,
- prefsize.cy);
+ gfx::Size prefsize = remove_all_button_.GetPreferredSize();
+ int button_y = parent_bounds.bottom - prefsize.height() - kButtonVEdgeMargin;
+ remove_all_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.width(),
+ prefsize.height());
}
-void PasswordManagerView::GetPreferredSize(CSize* out) {
- out->cx = kDefaultWindowWidth;
- out->cy = kDefaultWindowHeight;
+gfx::Size PasswordManagerView::GetPreferredSize() {
+ return gfx::Size(kDefaultWindowWidth, kDefaultWindowHeight);
}
void PasswordManagerView::ViewHierarchyChanged(bool is_add,

Powered by Google App Engine
This is Rietveld 408576698