chrome/browser/ui/views/toolbar/toolbar_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: chrome/browser/ui/views/toolbar/toolbar_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

« chrome/browser/ui/views/tabs/tab_strip.cc ('K') | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | ui/app_list/views/app_list_item_view.cc » ('j') | ui/views/controls/button/custom_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 808e450ab02544f0e0ca7a8870b5297cc3cfd350..af4d4f1ffe70d9b4d3bb88d8b6b161a7f21f1265 100644

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

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

@@ -154,7 +154,7 @@ void ToolbarButton::OnMouseExited(const ui::MouseEvent& event) {

// Starting a drag results in a MouseExited, we need to ignore it.

// A right click release triggers an exit event. We want to

// remain in a PUSHED state until the drop down menu closes.

- if (state_ != STATE_DISABLED && !InDrag() && state_ != STATE_PRESSED)

+ if (state() != STATE_DISABLED && !InDrag() && state() != STATE_PRESSED)

SetState(STATE_NORMAL);

}

@@ -346,7 +346,7 @@ void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {

SetMouseHandler(nullptr);

// Set the state back to normal after the drop down menu is closed.

- if (state_ != STATE_DISABLED)

+ if (state() != STATE_DISABLED)

SetState(STATE_NORMAL);

}