summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authorfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 07:55:02 +0000
committerfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 07:55:02 +0000
commitd0aa78d6fb5e0163a91cde098f1b40f98cc164c0 (patch)
treedcf235108b83c96a83deb5a87a522485950f1de0 /chrome/common/pref_names.h
parentc5b03f3c98aa1b39c5f008cadb21b8b4d20612bd (diff)
downloadchromium_src-d0aa78d6fb5e0163a91cde098f1b40f98cc164c0.zip
chromium_src-d0aa78d6fb5e0163a91cde098f1b40f98cc164c0.tar.gz
chromium_src-d0aa78d6fb5e0163a91cde098f1b40f98cc164c0.tar.bz2
Remove per-tab preference machinery.
It's no longer needed, according to mnaganov@, and it wasn't interacting well with extension-controlled preferences. This is a partial revert of the following: http://codereview.chromium.org/8879016/ http://codereview.chromium.org/8747015/ http://codereview.chromium.org/8716004/ http://codereview.chromium.org/8568019/ The "global" pref names are are kept as is. I plan to rename them back to the original names after this patch. Also, per-tab preferences introduced in the following are reverted: https://chromiumcodereview.appspot.com/9264071/ https://chromiumcodereview.appspot.com/9255018/ BUG=105537 TEST=manually and unit_tests --gtest_filter=Pref* and browser_tests --gtest_filter=PrefsTabHelperBrowserTest* still pass Review URL: http://codereview.chromium.org/9838050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index e61247c..baec892 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -106,7 +106,6 @@ extern const char kWebKitGlobalJavascriptCanOpenWindowsAutomatically[];
extern const char kWebKitJavascriptCanOpenWindowsAutomatically[];
extern const char kWebKitGlobalLoadsImagesAutomatically[];
extern const char kWebKitLoadsImagesAutomatically[];
-extern const char kWebKitImagesEnabled[];
extern const char kWebKitGlobalPluginsEnabled[];
extern const char kWebKitPluginsEnabled[];
extern const char kWebKitDomPasteEnabled[];
@@ -118,7 +117,6 @@ extern const char kWebKitJavaEnabled[];
extern const char kWebkitTabsToLinks[];
extern const char kWebKitAllowDisplayingInsecureContent[];
extern const char kWebKitAllowRunningInsecureContent[];
-extern const char kWebKitXSSAuditorEnabled[];
extern const char kPasswordManagerEnabled[];
extern const char kPasswordManagerAllowShowPasswords[];
extern const char kAutologinEnabled[];