summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authordhnishi <dhnishi@chromium.org>2014-09-09 10:15:42 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 17:24:57 +0000
commit14eb3501eda591182fe53df1312039e0d0e90858 (patch)
treef5116bc9303360b45e2fd7a99454d1a12f5935bf /chrome/common/pref_names.h
parent583f99aeb0883bae698e59263efda2a279c66567 (diff)
downloadchromium_src-14eb3501eda591182fe53df1312039e0d0e90858.zip
chromium_src-14eb3501eda591182fe53df1312039e0d0e90858.tar.gz
chromium_src-14eb3501eda591182fe53df1312039e0d0e90858.tar.bz2
Remove Google Talk plugin whitelisting now that b/11355273 is fixed.
BUG=115472 Review URL: https://codereview.chromium.org/551093003 Cr-Commit-Position: refs/heads/master@{#293959}
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 3b7eac3..26e95e7 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -325,7 +325,6 @@ extern const char kDefaultContentSettings[];
extern const char kContentSettingsClearOnExitMigrated[];
extern const char kContentSettingsVersion[];
extern const char kContentSettingsPatternPairs[];
-extern const char kContentSettingsDefaultWhitelistVersion[];
extern const char kContentSettingsPluginWhitelist[];
extern const char kBlockThirdPartyCookies[];
extern const char kClearSiteDataOnExit[];