ui/views/controls/menu/menu_scroll_view_container.cc - Issue 273223002: views: Make view::Views::GetPreferredSize() const.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_scroll_view_container.cc

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More compile fix for ToT Created 6 years, 7 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:

Index: ui/views/controls/menu/menu_scroll_view_container.cc

diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc

index 9201c4af7f4d7f46e19df53435b59d5d9d256bc0..451bd1537ad5b4cf5d66b8f552ede0800c1d8b5f 100644

--- a/ui/views/controls/menu/menu_scroll_view_container.cc

+++ b/ui/views/controls/menu/menu_scroll_view_container.cc

@@ -40,7 +40,7 @@ class MenuScrollButton : public View {

pref_height_(MenuItemView::pref_menu_height()) {

}

- virtual gfx::Size GetPreferredSize() OVERRIDE {

+ virtual gfx::Size GetPreferredSize() const OVERRIDE {

return gfx::Size(

host_->GetMenuItem()->GetMenuConfig().scroll_arrow_height * 2 - 1,

pref_height_);

@@ -243,7 +243,7 @@ void MenuScrollViewContainer::Layout() {

scroll_view_->Layout();

}

-gfx::Size MenuScrollViewContainer::GetPreferredSize() {

+gfx::Size MenuScrollViewContainer::GetPreferredSize() const {

gfx::Size prefsize = scroll_view_->GetContents()->GetPreferredSize();

gfx::Insets insets = GetInsets();

prefsize.Enlarge(insets.width(), insets.height());