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

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: 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/extensions/app_launcher.h ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..385517725b5be28c0b4f5be2659400839b5cd963 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* registry) {
// 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().
@@ -112,7 +113,7 @@ void RegisterPrefs(PrefServiceSimple* pref_service) {
// that the value hasn't changed since last time it was checked, using this
// preference.
bool is_enabled = SynchronousAppLauncherChecks() == APP_LAUNCHER_ENABLED;
- pref_service->RegisterBooleanPref(prefs::kAppLauncherIsEnabled, is_enabled);
+ registry->RegisterBooleanPref(prefs::kAppLauncherIsEnabled, is_enabled);
}
} // namespace app_launcher
« no previous file with comments | « chrome/browser/extensions/app_launcher.h ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698