diff options
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index e0256a4..a982561 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -35,6 +35,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { BookmarkManagerView::RegisterPrefs(local_state); Browser::RegisterPrefs(local_state); BrowserView::RegisterBrowserViewPrefs(local_state); + browser_shutdown::RegisterPrefs(local_state); CacheManagerHost::RegisterPrefs(local_state); chrome_browser_net::RegisterPrefs(local_state); GoogleURLTracker::RegisterPrefs(local_state); @@ -44,8 +45,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { RenderProcessHost::RegisterPrefs(local_state); TaskManager::RegisterPrefs(local_state); ExternalProtocolHandler::RegisterPrefs(local_state); - SafeBrowsingService::RegisterUserPrefs(local_state); - browser_shutdown::RegisterPrefs(local_state); + SafeBrowsingService::RegisterPrefs(local_state); // User prefs BookmarkBarView::RegisterUserPrefs(user_prefs); @@ -60,5 +60,5 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); WebContents::RegisterUserPrefs(user_prefs); } -} // namespace browser +} // namespace browser diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 5a7a617..d86d219 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -577,7 +577,7 @@ void SafeBrowsingService::DatabaseLoadComplete(bool database_error) { } // static -void SafeBrowsingService::RegisterUserPrefs(PrefService* prefs) { +void SafeBrowsingService::RegisterPrefs(PrefService* prefs) { prefs->RegisterStringPref(prefs::kSafeBrowsingClientKey, L""); prefs->RegisterStringPref(prefs::kSafeBrowsingWrappedKey, L""); } diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index e50e6c9..1d5f229 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -160,7 +160,7 @@ class SafeBrowsingService void DatabaseLoadComplete(bool database_error); // Preference handling. - static void RegisterUserPrefs(PrefService* prefs); + static void RegisterPrefs(PrefService* prefs); // The SafeBrowsing system has instructed us to reset our database. void ResetDatabase(); |