Use same base class for popup and plugin blocking UI

chrome/browser/ui/content_settings/content_setting_bubble_model.h

 // Copyright (c) 2012 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 CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 16 matching lines @@
 namespace content {
 class WebContents;
 }
 
 // This model provides data for ContentSettingBubble, and also controls
 // the action triggered when the allow / block radio buttons are triggered.
 class ContentSettingBubbleModel : public content::NotificationObserver {
  public:
   typedef ContentSettingBubbleModelDelegate Delegate;
 
-  struct PopupItem {
-    PopupItem(const gfx::Image& image, const std::string& title, int32 popup_id)
-        : image(image), title(title), popup_id(popup_id) {}
+  struct ListItem {
+    ListItem(const gfx::Image& image,
+             const std::string& title,
+             bool has_link,
+             int32 item_id)
+        : image(image), title(title), has_link(has_link), item_id(item_id) {}
 
     gfx::Image image;
     std::string title;
-    int32 popup_id;
+    bool has_link;
+    int32 item_id;
   };
-  typedef std::vector<PopupItem> PopupItems;
+  typedef std::vector<ListItem> ListItems;
 
   typedef std::vector<std::string> RadioItems;
   struct RadioGroup {
     RadioGroup();
     ~RadioGroup();
 
     GURL url;
     std::string title;
     RadioItems radio_items;
     int default_item;
@@ skipping 16 matching lines @@
     content::MediaStreamDevice selected_device;
     bool disabled;
   };
   typedef std::map<content::MediaStreamType, MediaMenu> MediaMenuMap;
 
   struct BubbleContent {
     BubbleContent();
     ~BubbleContent();
 
     std::string title;
-    base::string16 plugin_names;
-    PopupItems popup_items;
+    ListItems list_items;
     RadioGroup radio_group;
     bool radio_group_enabled;
     std::vector<DomainList> domain_lists;
     std::string custom_link;
     bool custom_link_enabled;
     std::string manage_link;
     MediaMenuMap media_menus;
     std::string learn_more_link;
 
    private:
@@ skipping 11 matching lines @@
   ContentSettingsType content_type() const { return content_type_; }
 
   const BubbleContent& bubble_content() const { return bubble_content_; }
 
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   virtual void OnRadioClicked(int radio_index) {}
-  virtual void OnPopupClicked(int index) {}
+  virtual void OnListItemClicked(int index) {}
   virtual void OnCustomLinkClicked() {}
   virtual void OnManageLinkClicked() {}
   virtual void OnLearnMoreLinkClicked() {}
   virtual void OnMediaMenuClicked(content::MediaStreamType type,
                                   const std::string& selected_device_id) {}
 
   // Called by the view code when the bubble is closed by the user using the
   // Done button.
   virtual void OnDoneClicked() {}
 
  protected:
   ContentSettingBubbleModel(
       content::WebContents* web_contents,
       Profile* profile,
       ContentSettingsType content_type);
 
   content::WebContents* web_contents() const { return web_contents_; }
   Profile* profile() const { return profile_; }
 
   void set_title(const std::string& title) { bubble_content_.title = title; }
-  void set_plugin_names(const base::string16& plugin_names) {
-    bubble_content_.plugin_names = plugin_names;
-  }
-  void add_popup(const PopupItem& popup) {
-    bubble_content_.popup_items.push_back(popup);
+  void add_list_item(const ListItem& item) {
+    bubble_content_.list_items.push_back(item);
   }
   void set_radio_group(const RadioGroup& radio_group) {
     bubble_content_.radio_group = radio_group;
   }
   void set_radio_group_enabled(bool enabled) {
     bubble_content_.radio_group_enabled = enabled;
   }
   void add_domain_list(const DomainList& domain_list) {
     bubble_content_.domain_lists.push_back(domain_list);
   }
@@ skipping 55 matching lines @@
   void OnLearnMoreLinkClicked() override;
   Delegate* delegate_;
 };
 
 // RPH stands for Register Protocol Handler.
 class ContentSettingRPHBubbleModel : public ContentSettingTitleAndLinkModel {
  public:
   ContentSettingRPHBubbleModel(Delegate* delegate,
                                content::WebContents* web_contents,
                                Profile* profile,
-                               ProtocolHandlerRegistry* registry,
-                               ContentSettingsType content_type);
+                               ProtocolHandlerRegistry* registry);
 
   void OnRadioClicked(int radio_index) override;
   void OnDoneClicked() override;
 
  private:
   void RegisterProtocolHandler();
   void UnregisterProtocolHandler();
   void IgnoreProtocolHandler();
   void ClearOrSetPreviousHandler();
 
   int selected_item_;
   ProtocolHandlerRegistry* registry_;
   ProtocolHandler pending_handler_;
   ProtocolHandler previous_handler_;
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_