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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index f8398b137aa95f986556dc51ec86f2ea6827577a..e473b43f51e5d0f1da7fa274c6146a7fbb0a95ca 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/jankometer.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/service/service_process_control.h"
@@ -77,10 +78,10 @@ int shutdown_num_processes_slow_;
const char kShutdownMsFile[] = "chrome_shutdown_ms.txt";
-void RegisterPrefs(PrefServiceSimple* local_state) {
- local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
- local_state->RegisterIntegerPref(prefs::kShutdownNumProcesses, 0);
- local_state->RegisterIntegerPref(prefs::kShutdownNumProcessesSlow, 0);
+void RegisterPrefs(PrefRegistrySimple* registry) {
+ registry->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
+ registry->RegisterIntegerPref(prefs::kShutdownNumProcesses, 0);
+ registry->RegisterIntegerPref(prefs::kShutdownNumProcessesSlow, 0);
}
ShutdownType GetShutdownType() {
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698