chrome/browser/extensions/app_launcher.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/extensions/app_launcher.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Respond to review comments. 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

« chrome/browser/chromeos/audio/audio_handler.cc ('K') | « chrome/browser/extensions/app_launcher.h ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | chrome/browser/external_protocol/external_protocol_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/app_launcher.cc

diff --git a/chrome/browser/extensions/app_launcher.cc b/chrome/browser/extensions/app_launcher.cc

index 7590bbd636743497c98846ee66b44b19eada2332..6182202097262a14fad61776235ae92eb2e91086 100644

--- a/chrome/browser/extensions/app_launcher.cc

+++ b/chrome/browser/extensions/app_launcher.cc

@@ -7,6 +7,7 @@

#include "base/command_line.h"

#include "base/threading/sequenced_worker_pool.h"

#include "chrome/browser/browser_process.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

@@ -102,7 +103,7 @@ bool IsAppLauncherEnabled() {

namespace app_launcher {

-void RegisterPrefs(PrefServiceSimple* pref_service) {

+void RegisterPrefs(PrefRegistrySimple* pref_service) {

// If it is impossible to synchronously determine whether the app launcher is

// enabled, assume it is disabled. Anything that needs to know the absolute

// truth should call UpdateIsAppLauncherEnabled().