chrome/browser/ui/views/toolbar/app_menu_button.cc - Issue 1682603002: [UI Views] Don't allow a ButtonListener and a MenuButtonListener

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

Issue 1682603002: [UI Views] Don't allow a ButtonListener and a MenuButtonListener (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 4 years, 10 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

Index: chrome/browser/ui/views/toolbar/app_menu_button.cc

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

index a277f246b37c2fe11332d44e6322bc3af583157d..78657600e43a81dadd852006e7ad5bfb724e9308 100644

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

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

@@ -35,12 +35,11 @@

bool AppMenuButton::g_open_app_immediately_for_testing = false;

AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)

- : views::MenuButton(NULL, base::string16(), toolbar_view, false),

+ : views::MenuButton(base::string16(), toolbar_view, false),

severity_(AppMenuIconPainter::SEVERITY_NONE),

toolbar_view_(toolbar_view),

allow_extension_dragging_(

- extensions::FeatureSwitch::extension_action_redesign()

- ->IsEnabled()),

+ extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),

destroyed_(nullptr),

margin_trailing_(0),

ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),

« no previous file with comments | « chrome/browser/ui/views/tab_icon_view.cc ('k') | chrome/browser/ui/views/toolbar/chevron_menu_button.cc » ('j') | no next file with comments »