diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:55:01 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:55:01 +0000 |
| commit | 32f076f65de1d1e40b462a6a704b27b34a9725ca (patch) | |
| tree | d7e3481c328f6c652574660d4fba4d51bb990400 /chrome/browser/net/chrome_url_request_context.cc | |
| parent | def7569aa65431ec13b61ef43803ddcf0dabcf44 (diff) | |
| download | chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.zip chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.tar.gz chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.tar.bz2 | |
Migrate old cookie setting to new system.
Also, do a better job of making sure we don't write useless default values to disk, and we force the in-memory copy of the default prefs to never say "DEFAULT" even if a caller provides that to SetDefaultContentSetting().
BUG=32719
TEST=unittests
Review URL: http://codereview.chromium.org/562003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index dee0d62..6b97030 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -508,7 +508,6 @@ void ChromeURLRequestContextGetter::CleanupOnUIThread() { if (prefs_) { // Unregister for pref notifications. prefs_->RemovePrefObserver(prefs::kAcceptLanguages, this); - prefs_->RemovePrefObserver(prefs::kCookieBehavior, this); prefs_->RemovePrefObserver(prefs::kDefaultCharset, this); prefs_ = NULL; } @@ -566,7 +565,6 @@ void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) { prefs_ = profile->GetPrefs(); prefs_->AddPrefObserver(prefs::kAcceptLanguages, this); - prefs_->AddPrefObserver(prefs::kCookieBehavior, this); prefs_->AddPrefObserver(prefs::kDefaultCharset, this); } |