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

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

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month 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 8cb7c51b811f5fa796932cdd6e4a8877f28c2c8a..3130ed201a8dddec9c04a69580c276a5a3287e86 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -295,37 +295,29 @@ void ChromeURLRequestContextGetter::CleanupOnUIThread() {
registrar_.RemoveAll();
}
-// content::NotificationObserver implementation.
-void ChromeURLRequestContextGetter::Observe(
- int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void ChromeURLRequestContextGetter::OnPreferenceChanged(
+ PrefServiceBase* prefs,
+ const std::string& pref_name_in) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (chrome::NOTIFICATION_PREF_CHANGED == type) {
- std::string* pref_name_in = content::Details<std::string>(details).ptr();
- PrefService* prefs = content::Source<PrefService>(source).ptr();
- DCHECK(pref_name_in && prefs);
- if (*pref_name_in == prefs::kAcceptLanguages) {
- std::string accept_language =
- prefs->GetString(prefs::kAcceptLanguages);
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(
- &ChromeURLRequestContextGetter::OnAcceptLanguageChange,
- this,
- accept_language));
- } else if (*pref_name_in == prefs::kDefaultCharset) {
- std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(
- &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
- this,
- default_charset));
- }
- } else {
- NOTREACHED();
+ DCHECK(prefs);
+ if (pref_name_in == prefs::kAcceptLanguages) {
+ std::string accept_language =
+ prefs->GetString(prefs::kAcceptLanguages);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(
+ &ChromeURLRequestContextGetter::OnAcceptLanguageChange,
+ this,
+ accept_language));
+ } else if (pref_name_in == prefs::kDefaultCharset) {
+ std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(
+ &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
+ this,
+ default_charset));
}
}
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.h ('k') | chrome/browser/net/http_server_properties_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698