Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

chrome/browser/ui/webui/options2/content_settings_handler2.cc

 // Copyright (c) 2011 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/ui/webui/options2/content_settings_handler2.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 631 matching lines @@
       base::Bind(&ContentSettingsHandler::RemoveException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setException",
       base::Bind(&ContentSettingsHandler::SetException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("checkExceptionPatternValidity",
       base::Bind(&ContentSettingsHandler::CheckExceptionPatternValidity,
                  base::Unretained(this)));
 }
 
+void ContentSettingsHandler::ApplyWhitelist(ContentSettingsType content_type,
+                                            ContentSetting default_setting) {
+  Profile* profile = Profile::FromWebUI(web_ui());
+  HostContentSettingsMap* map = GetContentSettingsMap();
+  if (content_type != CONTENT_SETTINGS_TYPE_PLUGINS)
+    return;
+  const int kDefaultWhitelistVersion = 1;
+  PrefService* prefs = profile->GetPrefs();
+  int version = prefs->GetInteger(
+      prefs::kContentSettingsDefaultWhitelistVersion);
+  if (version >= kDefaultWhitelistVersion)
+    return;
+  ContentSetting old_setting =
+      map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, NULL);
+  if (old_setting == CONTENT_SETTING_ALLOW &&
+      default_setting == CONTENT_SETTING_ASK) {
+    map->SetWebsiteSetting(
+        ContentSettingsPattern::Wildcard(),
+        ContentSettingsPattern::Wildcard(),
+        CONTENT_SETTINGS_TYPE_PLUGINS,
+        "google-talk",
+        Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+  }
+  prefs->SetInteger(prefs::kContentSettingsDefaultWhitelistVersion,
+                    kDefaultWhitelistVersion);
+}
+
 void ContentSettingsHandler::SetContentFilter(const ListValue* args) {
   DCHECK_EQ(2U, args->GetSize());
   std::string group, setting;
   if (!(args->GetString(0, &group) &&
         args->GetString(1, &setting))) {
     NOTREACHED();
     return;
   }
 
   ContentSetting default_setting = ContentSettingFromString(setting);
   ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group);
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     Profile* profile = Profile::FromWebUI(web_ui());
     DesktopNotificationServiceFactory::GetForProfile(profile)->
         SetDefaultContentSetting(default_setting);
   } else {
-    GetContentSettingsMap()->
-        SetDefaultContentSetting(content_type, default_setting);
+    HostContentSettingsMap* map = GetContentSettingsMap();
+    ApplyWhitelist(content_type, default_setting);
+    map->SetDefaultContentSetting(content_type, default_setting);
   }
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultCookieSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
       content::RecordAction(
           UserMetricsAction("Options_DefaultImagesSettingChanged"));
       break;
@@ skipping 169 matching lines @@
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }
 
 }  // namespace options2