[Win] Add per-plugin exceptions to content settings.

Screenshot: http://imgur.com/yxEzO.png

BUG=39252
TEST=PluginExceptionsTableModel.*

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

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

1 files changed, 20 insertions, 4 deletions

diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index c017558..ac2ab38 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification_exceptions_table_model.h"
+#include "chrome/browser/plugin_exceptions_table_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/exceptions_view.h"
 #include "chrome/browser/views/options/simple_content_exceptions_view.h"
@@ -190,12 +191,27 @@ void ContentFilterPageView::ButtonPressed(views::Button* sender,
               profile()->GetDesktopNotificationService()),
           IDS_NOTIFICATIONS_EXCEPTION_TITLE);
     } else {
-      ExceptionsView::ShowExceptionsWindow(GetWindow()->GetNativeWindow(),
-          profile()->GetHostContentSettingsMap(),
+      HostContentSettingsMap* settings = profile()->GetHostContentSettingsMap();
+      HostContentSettingsMap* otr_settings =
           profile()->HasOffTheRecordProfile() ?
               profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap() :
-              NULL,
-          content_type_);
+              NULL;
+      if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableResourceContentSettings)) {
+        PluginExceptionsTableModel* model =
+            new PluginExceptionsTableModel(settings, otr_settings);
+        model->LoadSettings();
+        SimpleContentExceptionsView::ShowExceptionsWindow(
+            GetWindow()->GetNativeWindow(),
+            model,
+            IDS_PLUGINS_EXCEPTION_TITLE);
+      } else {
+        ExceptionsView::ShowExceptionsWindow(GetWindow()->GetNativeWindow(),
+                                             settings,
+                                             otr_settings,
+                                             content_type_);
+      }
     }
     return;
   }