chrome/browser/ui/views/toolbar/toolbar_button.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: chrome/browser/ui/views/toolbar/toolbar_button.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: chrome/browser/ui/views/toolbar/toolbar_button.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc

index dad98d13bf9a4106a9268e14d919e5c0d03946cd..7a285d39e02a23c3b1990408d2886dfa953b8195 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc

@@ -46,7 +46,7 @@ bool ToolbarButton::IsMenuShowing() const {

return menu_showing_;

}

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

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

gfx::Size size(image()->GetPreferredSize());

gfx::Size label_size = label()->GetPreferredSize();

if (label_size.width() > 0)