diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 12:27:23 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 12:27:23 +0000 |
| commit | 77641700fad68651e04cf3d56be7cdaa498b283f (patch) | |
| tree | 2407083b57913c47ce3dd417ebea116178f3623a /chrome/browser/extensions/extension_prefs.h | |
| parent | 48b5e5e6868fbd1b547de16d7806aa2180a827db (diff) | |
| download | chromium_src-77641700fad68651e04cf3d56be7cdaa498b283f.zip chromium_src-77641700fad68651e04cf3d56be7cdaa498b283f.tar.gz chromium_src-77641700fad68651e04cf3d56be7cdaa498b283f.tar.bz2 | |
Separate proxy settings for Incognito mode.
This CL enables setting different proxy settings for regular windows and incognito windows. Also it allows removing a preference set by an extension (in order to fall back to the default/recommended value again).
This CL depends on http://codereview.chromium.org/5915004/ which is not landed, yet.
BUG=509
TEST=unit tests, no manual test, yet (will follow once appropriate extensions are available)
Review URL: http://codereview.chromium.org/6261004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_prefs.h')
| -rw-r--r-- | chrome/browser/extensions/extension_prefs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h index 8eae7c1..22c0c70 100644 --- a/chrome/browser/extensions/extension_prefs.h +++ b/chrome/browser/extensions/extension_prefs.h @@ -270,6 +270,10 @@ class ExtensionPrefs { bool incognito, Value* value); + void RemoveExtensionControlledPref(const std::string& extension_id, + const std::string& pref_key, + bool incognito); + static void RegisterUserPrefs(PrefService* prefs); // The underlying PrefService. |