Re-attempt at http://codereview.chromium.org/1344002...

chrome/browser/content_setting_bubble_model.h

Index: chrome/browser/content_setting_bubble_model.h
===================================================================
--- chrome/browser/content_setting_bubble_model.h	(revision 42668)
+++ chrome/browser/content_setting_bubble_model.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_H_
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -13,6 +14,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+class GURL;
 class Profile;
 class SkBitmap;
 class TabContents;
@@ -46,11 +48,18 @@
   };
   typedef std::vector<RadioGroup> RadioGroups;
 
+  struct DomainList {
+    std::string title;
+    std::set<std::string> hosts;
+  };
+
   struct BubbleContent {
     std::string title;
     PopupItems popup_items;
     RadioGroups radio_groups;
+    std::vector<DomainList> domain_lists;
     std::string manage_link;
+    std::string clear_link;
   };
 
   const BubbleContent& bubble_content() const { return bubble_content_; }
@@ -63,6 +72,7 @@
   virtual void OnRadioClicked(int radio_group, int radio_index) {}
   virtual void OnPopupClicked(int index) {}
   virtual void OnManageLinkClicked() {}
+  virtual void OnClearLinkClicked() {}
 
  protected:
   ContentSettingBubbleModel(TabContents* tab_contents, Profile* profile,
@@ -78,9 +88,15 @@
   void add_radio_group(const RadioGroup& radio_group) {
     bubble_content_.radio_groups.push_back(radio_group);
   }
+  void add_domain_list(const DomainList& domain_list) {
+    bubble_content_.domain_lists.push_back(domain_list);
+  }
   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;
+  }
 
  private:
   TabContents* tab_contents_;
Property changes on: chrome/browser/content_setting_bubble_model.h
___________________________________________________________________
Name: svn:eol-style
   + LF