ui/views/controls/button/label_button.cc - Issue 1534303002: CustomButton cleanup: make protected members private, create accessors

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.cc

Issue 1534303002: CustomButton cleanup: make protected members private, create accessors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tidy up Created 5 years 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.h ('K') | « ui/views/controls/button/image_button.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2b870a24142d4e5641684a7b3bc334f07f08f7da..00eaff22b58a328fe7e2aa41f010e0f62cad15b2 100644

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

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

@@ -498,7 +498,7 @@ ui::NativeTheme::State LabelButton::GetThemeState(

}

const gfx::Animation* LabelButton::GetThemeAnimation() const {

- return hover_animation_.get();

+ return &hover_animation();

}

ui::NativeTheme::State LabelButton::GetBackgroundThemeState(