ui/views/controls/button/text_button.h - 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/button/text_button.h

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

Patch Set: Rebase to 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('K') | « ui/views/controls/button/menu_button.cc ('k') | ui/views/controls/button/text_button.cc » ('j') | ui/views/controls/styled_label.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/button/text_button.h

diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h

index 9185b59f3694504d48ff28ab2e54339bb7c8273b..3db301ac9f09441142fcc9b62bdbf5bd3853d343 100644

--- a/ui/views/controls/button/text_button.h

+++ b/ui/views/controls/button/text_button.h

@@ -161,9 +161,9 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,

virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);

// Overridden from View:

- virtual gfx::Size GetPreferredSize() OVERRIDE;

- virtual gfx::Size GetMinimumSize() OVERRIDE;

- virtual int GetHeightForWidth(int w) OVERRIDE;

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

+ virtual gfx::Size GetMinimumSize() const OVERRIDE;

+ virtual int GetHeightForWidth(int w) const OVERRIDE;

virtual void OnEnabledChanged() OVERRIDE;

virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;

virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;

@@ -182,7 +182,7 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,

void UpdateTextSize();

// Calculate the size of the text size without setting any of the members.

- void CalculateTextSize(gfx::Size* text_size, int max_width);

+ void CalculateTextSize(gfx::Size* text_size, int max_width) const;

void set_color_enabled(SkColor color) { color_enabled_ = color; }

void set_color_disabled(SkColor color) { color_disabled_ = color; }

@@ -228,7 +228,7 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,

base::string16 text_;

// The size of the text string.

- gfx::Size text_size_;

+ mutable gfx::Size text_size_;

// Track the size of the largest text string seen so far, so that

// changing text_ will not resize the button boundary.

@@ -321,7 +321,7 @@ class VIEWS_EXPORT TextButton : public TextButtonBase {

void set_full_justification(bool full_justification);

// Overridden from View:

- virtual gfx::Size GetPreferredSize() OVERRIDE;

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

virtual const char* GetClassName() const OVERRIDE;

// Overridden from TextButtonBase: