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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/views/client_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/views/client_view.h ('k') | chrome/views/combo_box.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/client_view.cc
===================================================================
--- chrome/views/client_view.cc (revision 3391)
+++ chrome/views/client_view.cc (working copy)
@@ -22,12 +22,12 @@
///////////////////////////////////////////////////////////////////////////////
// ClientView, View overrides:
-void ClientView::GetPreferredSize(CSize* out) {
- DCHECK(out);
+gfx::Size ClientView::GetPreferredSize() {
// |contents_view_| is allowed to be NULL up until the point where this view
// is attached to a ViewContainer.
if (contents_view_)
- contents_view_->GetPreferredSize(out);
+ return contents_view_->GetPreferredSize();
+ return gfx::Size();
}
void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/views/client_view.h ('k') | chrome/views/combo_box.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698