Introduce a resource identifier for content settings.

chrome/browser/content_setting_bubble_model.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/content_setting_bubble_model.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
@@ skipping 148 matching lines @@
     COMPILE_ASSERT(arraysize(kBlockIDs) == CONTENT_SETTINGS_NUM_TYPES,
                    Need_a_setting_for_every_content_settings_type);
     std::string radio_block_label;
     radio_block_label = l10n_util::GetStringFUTF8(
         kBlockIDs[content_type()], UTF8ToUTF16(display_host));
 
     radio_group.radio_items.push_back(radio_allow_label);
     radio_group.radio_items.push_back(radio_block_label);
     radio_group.default_item =
         profile()->GetHostContentSettingsMap()->GetContentSetting(url,
-            content_type()) == CONTENT_SETTING_ALLOW ? 0 : 1;
+            content_type(), "") == CONTENT_SETTING_ALLOW ? 0 : 1;
     set_radio_group(radio_group);
   }
 
   virtual void OnRadioClicked(int radio_index) {
     profile()->GetHostContentSettingsMap()->AddExceptionForURL(
         bubble_content().radio_group.url,
         content_type(),
+        "",
         radio_index == 0 ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
   }
 };
 
 class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup {
  public:
   ContentSettingPluginBubbleModel(TabContents* tab_contents, Profile* profile,
                                   ContentSettingsType content_type)
       : ContentSettingSingleRadioGroup(tab_contents, profile, content_type) {
     DCHECK_EQ(content_type, CONTENT_SETTINGS_TYPE_PLUGINS);
@@ skipping 176 matching lines @@
 ContentSettingBubbleModel::~ContentSettingBubbleModel() {
 }
 
 void ContentSettingBubbleModel::Observe(NotificationType type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   DCHECK(source == Source<TabContents>(tab_contents_));
   tab_contents_ = NULL;
 }