Update Content Settings Bubbles

chrome/browser/content_setting_bubble_model.h

Index: chrome/browser/content_setting_bubble_model.h
diff --git a/chrome/browser/content_setting_bubble_model.h b/chrome/browser/content_setting_bubble_model.h
index 49af1b29bad1b2e13d5d081bf10b1439b074a063..d3f93ecf181b79073937ac06d2b579f07bceecf9 100644
--- a/chrome/browser/content_setting_bubble_model.h
+++ b/chrome/browser/content_setting_bubble_model.h
@@ -69,10 +69,8 @@ class ContentSettingBubbleModel : public NotificationObserver {
     std::vector<DomainList> domain_lists;
     std::set<std::string> resource_identifiers;
     std::string manage_link;
-    std::string clear_link;
     std::string info_link;
-    std::string load_plugins_link_title;
-    bool load_plugins_link_enabled;
+    bool info_link_enabled;

[Peter Kasting, 2010/12/07 17:53:00]

Nit: I think "info_link" is too specific of a name if we're making this thing
into a generic, do-anything link.

Perhaps "custom_link"?

I think we should also move |manage_link| below that link, to reflect the
visible order within the bubble (and similarly reorder all the model functions
having to do with |manage_link|).

 
    private:
     DISALLOW_COPY_AND_ASSIGN(BubbleContent);
@@ -88,9 +86,7 @@ class ContentSettingBubbleModel : public NotificationObserver {
   virtual void OnRadioClicked(int radio_index) {}
   virtual void OnPopupClicked(int index) {}
   virtual void OnManageLinkClicked() {}
-  virtual void OnClearLinkClicked() {}
   virtual void OnInfoLinkClicked() {}
-  virtual void OnLoadPluginsLinkClicked() {}
 
  protected:
   ContentSettingBubbleModel(TabContents* tab_contents, Profile* profile,
@@ -112,17 +108,11 @@ class ContentSettingBubbleModel : public NotificationObserver {
   void set_manage_link(const std::string& link) {
     bubble_content_.manage_link = link;
   }
-  void set_clear_link(const std::string& link) {
-    bubble_content_.clear_link = link;
-  }
   void set_info_link(const std::string& link) {
     bubble_content_.info_link = link;
   }
-  void set_load_plugins_link_title(const std::string& title) {
-    bubble_content_.load_plugins_link_title = title;
-  }
-  void set_load_plugins_link_enabled(bool enabled) {
-    bubble_content_.load_plugins_link_enabled = enabled;
+  void set_info_link_enabled(bool enabled) {
+    bubble_content_.info_link_enabled = enabled;
   }
   void AddBlockedResource(const std::string& resource_identifier);