Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1806)

Unified Diff: chrome/browser/net/chrome_url_request_context.cc

Issue 10409046: Migrate the rest of the "global" prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_url_request_context.cc
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 80c0c8a6abae96e2d75a9a5e161ba09a233fbbff..11a4d9dbaa684789ed1ce4e933775acf7e4678ef 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -254,9 +254,8 @@ void ChromeURLRequestContextGetter::Observe(
&ChromeURLRequestContextGetter::OnAcceptLanguageChange,
this,
accept_language));
- } else if (*pref_name_in == prefs::kGlobalDefaultCharset) {
- std::string default_charset =
- prefs->GetString(prefs::kGlobalDefaultCharset);
+ } else if (*pref_name_in == prefs::kDefaultCharset) {
+ std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(
@@ -283,7 +282,7 @@ void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
registrar_.Init(profile->GetPrefs());
registrar_.Add(prefs::kAcceptLanguages, this);
- registrar_.Add(prefs::kGlobalDefaultCharset, this);
+ registrar_.Add(prefs::kDefaultCharset, this);
registrar_.Add(prefs::kClearSiteDataOnExit, this);
}
« no previous file with comments | « chrome/browser/extensions/extension_font_settings_apitest.cc ('k') | chrome/browser/prefs/overlay_user_pref_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698