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

Side by Side Diff: ui/views/window/client_view.cc

Issue 10802028: maxHeight/Width and miniHeight/Width of chrome.appWindow API failed in ShellWindow. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: refine the patch according to jeremya's comment. Created 8 years, 4 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 unified diff | Download patch
« no previous file with comments | « ui/views/window/client_view.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/window/client_view.h" 5 #include "ui/views/window/client_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/base/accessibility/accessible_view_state.h" 8 #include "ui/base/accessibility/accessible_view_state.h"
9 #include "ui/base/hit_test.h" 9 #include "ui/base/hit_test.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 /////////////////////////////////////////////////////////////////////////////// 45 ///////////////////////////////////////////////////////////////////////////////
46 // ClientView, View overrides: 46 // ClientView, View overrides:
47 47
48 gfx::Size ClientView::GetPreferredSize() { 48 gfx::Size ClientView::GetPreferredSize() {
49 // |contents_view_| is allowed to be NULL up until the point where this view 49 // |contents_view_| is allowed to be NULL up until the point where this view
50 // is attached to a Container. 50 // is attached to a Container.
51 return contents_view_ ? contents_view_->GetPreferredSize() : gfx::Size(); 51 return contents_view_ ? contents_view_->GetPreferredSize() : gfx::Size();
52 } 52 }
53 53
54 gfx::Size ClientView::GetMaximumSize() {
55 // |contents_view_| is allowed to be NULL up until the point where this view
56 // is attached to a Container.
57 return contents_view_ ? contents_view_->GetMaximumSize() : gfx::Size();
58 }
59
54 gfx::Size ClientView::GetMinimumSize() { 60 gfx::Size ClientView::GetMinimumSize() {
55 // |contents_view_| is allowed to be NULL up until the point where this view 61 // |contents_view_| is allowed to be NULL up until the point where this view
56 // is attached to a Container. 62 // is attached to a Container.
57 return contents_view_ ? contents_view_->GetMinimumSize() : gfx::Size(); 63 return contents_view_ ? contents_view_->GetMinimumSize() : gfx::Size();
58 } 64 }
59 65
60 void ClientView::Layout() { 66 void ClientView::Layout() {
61 // |contents_view_| is allowed to be NULL up until the point where this view 67 // |contents_view_| is allowed to be NULL up until the point where this view
62 // is attached to a Container. 68 // is attached to a Container.
63 if (contents_view_) 69 if (contents_view_)
(...skipping 18 matching lines...) Expand all
82 if (is_add && child == this) { 88 if (is_add && child == this) {
83 DCHECK(GetWidget()); 89 DCHECK(GetWidget());
84 DCHECK(contents_view_); // |contents_view_| must be valid now! 90 DCHECK(contents_view_); // |contents_view_| must be valid now!
85 // Insert |contents_view_| at index 0 so it is first in the focus chain. 91 // Insert |contents_view_| at index 0 so it is first in the focus chain.
86 // (the OK/Cancel buttons are inserted before contents_view_) 92 // (the OK/Cancel buttons are inserted before contents_view_)
87 AddChildViewAt(contents_view_, 0); 93 AddChildViewAt(contents_view_, 0);
88 } 94 }
89 } 95 }
90 96
91 } // namespace views 97 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/window/client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698