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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/views/options/options_window_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
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/browser/views/options/languages_page_view.cc ('k') | chrome/browser/views/page_info_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/options/options_window_view.cc
===================================================================
--- chrome/browser/views/options/options_window_view.cc (revision 3391)
+++ chrome/browser/views/options/options_window_view.cc (working copy)
@@ -53,7 +53,7 @@
// ChromeViews::View overrides:
virtual void Layout();
- virtual void GetPreferredSize(CSize* out);
+ virtual gfx::Size GetPreferredSize();
protected:
// ChromeViews::View overrides:
@@ -163,11 +163,10 @@
height() - (2 * kDialogPadding));
}
-void OptionsWindowView::GetPreferredSize(CSize* out) {
- DCHECK(out);
- *out = ChromeViews::Window::GetLocalizedContentsSize(
+gfx::Size OptionsWindowView::GetPreferredSize() {
+ return gfx::Size(ChromeViews::Window::GetLocalizedContentsSize(
IDS_OPTIONS_DIALOG_WIDTH_CHARS,
- IDS_OPTIONS_DIALOG_HEIGHT_LINES).ToSIZE();
+ IDS_OPTIONS_DIALOG_HEIGHT_LINES));
}
void OptionsWindowView::ViewHierarchyChanged(bool is_add,
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/browser/views/options/languages_page_view.cc ('k') | chrome/browser/views/page_info_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698