chrome/browser/ui/views/website_settings/permission_selector_view.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/website_settings/permission_selector_view.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

« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc ('k') | chrome/browser/ui/views/website_settings/permissions_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc

diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc

index 0a47968a357216ec433502d289278cca3b11f8f9..ddbcdf955a6f5e5a0e934438cf474c96df8d55b2 100644

--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc

+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc

@@ -62,8 +62,7 @@ class PermissionMenuButton : public views::MenuButton,

PermissionMenuButton::PermissionMenuButton(const base::string16& text,

PermissionMenuModel* model,

bool show_menu_marker)

- : MenuButton(NULL, text, this, show_menu_marker),

- menu_model_(model) {

+ : MenuButton(text, this, show_menu_marker), menu_model_(model) {

// Update the themed border before the NativeTheme is applied. Usually this

// happens in a call to LabelButton::OnNativeThemeChanged(). However, if

// PermissionMenuButton called that from its override, the NativeTheme would