ui/views/controls/button/label_button.h - Issue 1569113002: MacViews: Style BUTTON_STYLE buttons using the "modern" UI

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/label_button.h

Issue 1569113002: MacViews: Style BUTTON_STYLE buttons using the "modern" UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix desktop linux weirdness Created 4 years, 8 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

« ui/views/controls/button/custom_button.cc ('K') | « ui/views/controls/button/custom_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | ui/views/controls/button/label_button_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a8f419c96fabd120b146bfdba16ffe1f945b9794..9848b69260fda5f7a782d88638c193a500e7403e 100644

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

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

@@ -146,7 +146,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,

FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image);

FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);

FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList);

- FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, ButtonStyleIsDefaultSize);

void SetTextInternal(const base::string16& text);

@@ -167,6 +166,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton,

// as false.

void ResetCachedPreferredSize();

+ // Updates additional state related to focus or default status.

+ void HighlightStateChanged();

Elly Fong-Jones 2016/04/05 16:43:25 This function's comment is a little bit vague. It

tapted 2016/04/06 12:08:33 Done.

// The image and label shown in the button.

ImageView* image_;

Label* label_;