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

Unified Diff: chrome/browser/net/pref_proxy_config_tracker_impl.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/pref_proxy_config_tracker_impl.cc
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
index 9760f02e0e7bf61af796aba0e021b214118b21ab..50398abaaf3fff4691accdd3ea66e57b6612d920 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
@@ -287,13 +287,11 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
return false;
}
-void PrefProxyConfigTrackerImpl::Observe(
- int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void PrefProxyConfigTrackerImpl::OnPreferenceChanged(
+ PrefServiceBase* service,
+ const std::string& pref_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (type == chrome::NOTIFICATION_PREF_CHANGED &&
- content::Source<PrefService>(source).ptr() == pref_service_) {
+ if (service == pref_service_) {
net::ProxyConfig new_config;
ProxyPrefs::ConfigState config_state = ReadPrefConfig(&new_config);
if (config_state_ != config_state ||
@@ -307,7 +305,7 @@ void PrefProxyConfigTrackerImpl::Observe(
if (update_pending_)
OnProxyConfigChanged(config_state, new_config);
} else {
- NOTREACHED() << "Unexpected notification of type " << type;
+ NOTREACHED() << "Unexpected PrefService.";
}
}
« no previous file with comments | « chrome/browser/net/pref_proxy_config_tracker_impl.h ('k') | chrome/browser/net/ssl_config_service_manager_pref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698