Revert 55888: Allow per-plugin content settings.

Run with --enable-resource-content-settings and --enable-click-to-play to enable.

TabSpecificContentSettings now keeps track of which resources were blocked. The content setting bubble displays those resource, and selecting the "allow radio buttons adds exceptions for these resources.

The infobar for non-sandboxed plug-ins now also shows a button to always allow the blocked plug-in on that site.

Screenshot of the plugin bubble: http://imgur.com/6npqv.png

Because we need to change the title and radio button labels depending on whether we track specific plug-ins, we copy them from the ContentSettingBubbleModel.

XIB changes: Add a text field for the blocked plug-ins to ContentBlockedPlugins.xib, hooked up to the |blockedResourcesField_| outlet.

BUG=39252,38432
TEST=manual

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

TBR: bauerb@chromium.org

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

1 files changed, 0 insertions, 2 deletions

diff --git a/chrome/browser/content_setting_bubble_model.h b/chrome/browser/content_setting_bubble_model.h
index 97664d8..3d7c08a 100644
--- a/chrome/browser/content_setting_bubble_model.h
+++ b/chrome/browser/content_setting_bubble_model.h
@@ -58,7 +58,6 @@ class ContentSettingBubbleModel : public NotificationObserver {
     PopupItems popup_items;
     RadioGroup radio_group;
     std::vector<DomainList> domain_lists;
-    std::set<std::string> resource_identifiers;
     std::string manage_link;
     std::string clear_link;
     std::string info_link;
@@ -112,7 +111,6 @@ class ContentSettingBubbleModel : public NotificationObserver {
   void set_load_plugins_link_enabled(bool enabled) {
     bubble_content_.load_plugins_link_enabled = enabled;
   }
-  void AddBlockedResource(const std::string& resource_identifier);
 
  private:
   TabContents* tab_contents_;