diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-16 15:17:15 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-16 15:18:37 +0000 |
| commit | ac1e49eb6695f711d72215fcdf9388548942a00d (patch) | |
| tree | 88c78e7d66603996cf0dc78d7676b11d57a305bd /chrome/browser/net/chrome_url_request_context.cc | |
| parent | dac52a1b6f0c401bccca1e5713f782a8b26345b3 (diff) | |
| download | external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.zip external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.gz external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.bz2 | |
Merge Chromium at 9.0.597.69: Trivial merge by Git.
/branches/597/src@71538
Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 81a0402..f4ba1ca 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -583,15 +583,6 @@ void ChromeURLRequestContextGetter::ReleaseURLRequestContext() { url_request_context_ = NULL; } -void ChromeURLRequestContextGetter::RegisterUserPrefs( - PrefService* pref_service) { - pref_service->RegisterBooleanPref(prefs::kNoProxyServer, false); - pref_service->RegisterBooleanPref(prefs::kProxyAutoDetect, false); - pref_service->RegisterStringPref(prefs::kProxyServer, ""); - pref_service->RegisterStringPref(prefs::kProxyPacUrl, ""); - pref_service->RegisterStringPref(prefs::kProxyBypassList, ""); -} - net::CookieStore* ChromeURLRequestContextGetter::GetCookieStore() { // If we are running on the IO thread this is real easy. if (BrowserThread::CurrentlyOn(BrowserThread::IO)) |