Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(788)

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index ec5883af1aa92d0cfed1cdff9fcfa0270564cff5..40544c4976b41855897af44761e02e94a9c8042a 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -304,8 +304,7 @@ void ContentSettingBubbleContents::Init() {
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
views::MenuButton* menu_button = new views::MenuButton(
- NULL, base::UTF8ToUTF16((i->second.selected_device.name)),
- this, true);
+ base::UTF8ToUTF16((i->second.selected_device.name)), this, true);
menu_button->SetStyle(views::Button::STYLE_BUTTON);
menu_button->SetHorizontalAlignment(gfx::ALIGN_LEFT);
menu_button->set_animate_on_state_change(false);

Powered by Google App Engine
This is Rietveld 408576698