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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_service.cc

Issue 11414083: Remove PrefObserver usage, batch 9. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to sort-of good revision (r169014). 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/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index f22ac5e68a662bc5bbd193bc5f4a7e239e43a3f7..73b1506e8f03434305d40e05702e5c19aa3fa26f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -1375,13 +1375,6 @@ void SafeBrowsingService::Observe(int type,
}
}
-void SafeBrowsingService::OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(pref_name == prefs::kSafeBrowsingEnabled);
- RefreshState();
-}
-
bool SafeBrowsingService::IsWhitelisted(const UnsafeResource& resource) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Check if the user has already ignored our warning for this render_view
@@ -1412,7 +1405,9 @@ void SafeBrowsingService::AddPrefService(PrefService* pref_service) {
DCHECK(prefs_map_.find(pref_service) == prefs_map_.end());
PrefChangeRegistrar* registrar = new PrefChangeRegistrar();
registrar->Init(pref_service);
- registrar->Add(prefs::kSafeBrowsingEnabled, this);
+ registrar->Add(prefs::kSafeBrowsingEnabled,
+ base::Bind(&SafeBrowsingService::RefreshState,
+ base::Unretained(this)));
prefs_map_[pref_service] = registrar;
RefreshState();
}
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.h ('k') | chrome/browser/safe_browsing/safe_browsing_tab_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698