ui/app_list/views/search_box_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: ui/app_list/views/search_box_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/website_settings/permissions_bubble_view.cc ('k') | ui/message_center/views/notifier_settings_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/app_list/views/search_box_view.cc

diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc

index d59bf5446fdd70153fd0f4450ca8492ea446d047..1441d6c1631e14a3c6a56005577f7a9182f2b38c 100644

--- a/ui/app_list/views/search_box_view.cc

+++ b/ui/app_list/views/search_box_view.cc

@@ -172,7 +172,7 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,

#if !defined(OS_CHROMEOS)

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);

+ menu_button_ = new views::MenuButton(base::string16(), this, false);

menu_button_->SetBorder(views::Border::NullBorder());

menu_button_->SetImage(views::Button::STATE_NORMAL,

*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));