Simplify content settings bubble model "radio groups" to a single radio group.

There's no longer a use case for multiple radio groups (was originally planned for Geolocation), simplify the model and its views.

BUG=39073
TEST=content_setting_bubble_model_unittest

Review URL: http://codereview.chromium.org/1575022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44070 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/browser/content_setting_bubble_model.h b/chrome/browser/content_setting_bubble_model.h
index 5c21460..18cf6ac 100644
--- a/chrome/browser/content_setting_bubble_model.h
+++ b/chrome/browser/content_setting_bubble_model.h
@@ -46,7 +46,6 @@ class ContentSettingBubbleModel : public NotificationObserver {
     RadioItems radio_items;
     int default_item;
   };
-  typedef std::vector<RadioGroup> RadioGroups;
 
   struct DomainList {
     std::string title;
@@ -56,7 +55,7 @@ class ContentSettingBubbleModel : public NotificationObserver {
   struct BubbleContent {
     std::string title;
     PopupItems popup_items;
-    RadioGroups radio_groups;
+    RadioGroup radio_group;
     std::vector<DomainList> domain_lists;
     std::string manage_link;
     std::string clear_link;
@@ -69,7 +68,7 @@ class ContentSettingBubbleModel : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  virtual void OnRadioClicked(int radio_group, int radio_index) {}
+  virtual void OnRadioClicked(int radio_index) {}
   virtual void OnPopupClicked(int index) {}
   virtual void OnManageLinkClicked() {}
   virtual void OnClearLinkClicked() {}
@@ -85,8 +84,8 @@ class ContentSettingBubbleModel : public NotificationObserver {
   void add_popup(const PopupItem& popup) {
     bubble_content_.popup_items.push_back(popup);
   }
-  void add_radio_group(const RadioGroup& radio_group) {
-    bubble_content_.radio_groups.push_back(radio_group);
+  void set_radio_group(const RadioGroup& radio_group) {
+    bubble_content_.radio_group = radio_group;
   }
   void add_domain_list(const DomainList& domain_list) {
     bubble_content_.domain_lists.push_back(domain_list);