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

Unified Diff: chrome/browser/views/bookmark_editor_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/bookmark_editor_view.cc
===================================================================
--- chrome/browser/views/bookmark_editor_view.cc (revision 3391)
+++ chrome/browser/views/bookmark_editor_view.cc (working copy)
@@ -110,18 +110,16 @@
// buttons...
CRect parent_bounds;
GetParent()->GetLocalBounds(&parent_bounds, false);
- CSize prefsize;
- new_group_button_.GetPreferredSize(&prefsize);
- int button_y = parent_bounds.bottom - prefsize.cy - kButtonVEdgeMargin;
- new_group_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.cx,
- prefsize.cy);
+ gfx::Size prefsize = new_group_button_.GetPreferredSize();
+ int button_y = parent_bounds.bottom - prefsize.height() - kButtonVEdgeMargin;
+ new_group_button_.SetBounds(kPanelHorizMargin, button_y, prefsize.width(),
+ prefsize.height());
}
-void BookmarkEditorView::GetPreferredSize(CSize *out) {
- DCHECK(out);
- *out = ChromeViews::Window::GetLocalizedContentsSize(
+gfx::Size BookmarkEditorView::GetPreferredSize() {
+ return gfx::Size(ChromeViews::Window::GetLocalizedContentsSize(
IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS,
- IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES).ToSIZE();
+ IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES));
}
void BookmarkEditorView::DidChangeBounds(const CRect& previous,

Powered by Google App Engine
This is Rietveld 408576698