chrome/browser/browser_shutdown.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Switch to desired interfaces. Created 7 years, 11 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

Index: chrome/browser/browser_shutdown.cc

diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc

index d7339424b4fa15389b2d1bf88309092b8417bf06..e3504f576d30144e26bc57f4e4d627bac7406b4e 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"

@@ -78,7 +79,7 @@ int shutdown_num_processes_slow_;

const char kShutdownMsFile[] = "chrome_shutdown_ms.txt";

-void RegisterPrefs(PrefServiceSimple* local_state) {

+void RegisterPrefs(PrefRegistrySimple* local_state) {

local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);

local_state->RegisterIntegerPref(prefs::kShutdownNumProcesses, 0);

local_state->RegisterIntegerPref(prefs::kShutdownNumProcessesSlow, 0);

« base/prefs/public/pref_member_unittest.cc ('K') | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/prefs/browser_prefs.h » ('J')