Make notifier settings combobox a real combobox.

ui/message_center/views/notifier_settings_view.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_
 
 #include <memory>
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/menu_button_listener.h"
+#include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
+namespace ui {
+class ComboboxModel;
+}
+
 namespace views {
+class Combobox;
 class Label;
-class MenuButton;
-class MenuModelAdapter;
-class MenuRunner;
 }
 
 namespace message_center {
-class NotifierGroupMenuModel;
 
 // A class to show the list of notifier extensions / URL patterns and allow
 // users to customize the settings.
 class MESSAGE_CENTER_EXPORT NotifierSettingsView
     : public NotifierSettingsObserver,
       public views::View,
       public views::ButtonListener,
-      public views::MenuButtonListener {
+      public views::ComboboxListener {
  public:
   explicit NotifierSettingsView(NotifierSettingsProvider* provider);
   ~NotifierSettingsView() override;
 
   bool IsScrollable();
 
   // Overridden from NotifierSettingsDelegate:
   void UpdateIconImage(const NotifierId& notifier_id,
                        const gfx::Image& icon) override;
   void NotifierGroupChanged() override;
@@ skipping 51 matching lines @@
   // Overridden from views::View:
   void Layout() override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetPreferredSize() const override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // Overridden from views::MenuButtonListener:
-  void OnMenuButtonClicked(views::MenuButton* source,
-                           const gfx::Point& point,
-                           const ui::Event* event) override;
+  // Overridden from views::ComboboxListener:
+  void OnPerformAction(views::Combobox* combobox) override;
 
   // Callback for views::MenuModelAdapter.
   void OnMenuClosed();
 
   views::ImageButton* title_arrow_;
   views::Label* title_label_;
-  views::MenuButton* notifier_group_selector_;
+  views::Combobox* notifier_group_combobox_;
   views::ScrollView* scroller_;
   NotifierSettingsProvider* provider_;
   std::set<NotifierButton*> buttons_;
-  std::unique_ptr<NotifierGroupMenuModel> notifier_group_menu_model_;
-  std::unique_ptr<views::MenuModelAdapter> notifier_group_menu_model_adapter_;
-  std::unique_ptr<views::MenuRunner> notifier_group_menu_runner_;
+  std::unique_ptr<ui::ComboboxModel> notifier_group_model_;
 
   DISALLOW_COPY_AND_ASSIGN(NotifierSettingsView);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_