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

chrome/common/pref_names.cc

 // Copyright (c) 2012 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/common/pref_names.h"
 
 #include "base/basictypes.h"
 
 namespace prefs {
 
@@ skipping 785 matching lines @@
 
 // Patterns for mapping hostnames to content related settings. Default settings
 // will be applied to hosts that don't match any of the patterns. Replaces
 // kPerHostContentSettings. The pattern format used is defined by
 // kContentSettingsVersion.
 const char kContentSettingsPatterns[] = "profile.content_settings.patterns";
 
 const char kContentSettingsPatternPairs[] =
     "profile.content_settings.pattern_pairs";
 
+// Version of the content settings whitelist.
+const char kContentSettingsDefaultWhitelistVersion[] =
+    "profile.content_settings.whitelist_version";
+
+// Which plugins have been whitelisted manually by the user.
+const char kContentSettingsPluginWhitelist[] =
+    "profile.content_settings.plugin_whitelist";
+
 // Boolean that is true if we should unconditionally block third-party cookies,
 // regardless of other content settings.
 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies";
 
 // Boolean that is true when all locally stored site data (e.g. cookies, local
 // storage, etc..) should be deleted on exit.
 const char kClearSiteDataOnExit[] = "profile.clear_site_data_on_exit";
 
 // Double that indicates the default zoom level.
 const char kDefaultZoomLevel[] = "profile.default_zoom_level";
@@ skipping 923 matching lines @@
 
 // String that represents the recovery component last downloaded version. This
 // takes the usual 'a.b.c.d' notation.
 const char kRecoveryComponentVersion[] = "recovery_component.version";
 
 // String that stores the component updater last known state. This is used for
 // troubleshooting.
 const char kComponentUpdaterState[] = "component_updater.state";
 
 }  // namespace prefs