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

Unified Diff: chrome/browser/extensions/default_apps.cc

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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/default_apps.h ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/default_apps.cc
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc
index 3ecf9a0b5a252cabd2c8a3e7effb06ed804bbc50..f5892517741356ffce270ac1d15bd1ca0b77e120 100644
--- a/chrome/browser/extensions/default_apps.cc
+++ b/chrome/browser/extensions/default_apps.cc
@@ -7,9 +7,6 @@
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "components/user_prefs/pref_registry_syncable.h"
-#if !defined(OS_ANDROID)
-#include "chrome/browser/first_run/first_run.h"
-#endif
#include "base/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_switches.h"
@@ -18,6 +15,10 @@
#include "chrome/common/pref_names.h"
#include "ui/base/l10n/l10n_util.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/first_run/first_run.h"
+#endif
+
namespace {
const char kGmailId[] = "pjkljhegncpnkpknbcohdijeoejaedia";
@@ -49,9 +50,11 @@ bool IsLocaleSupported() {
namespace default_apps {
-void RegisterUserPrefs(PrefRegistrySyncable* registry) {
- registry->RegisterIntegerPref(prefs::kDefaultAppsInstallState, kUnknown,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+ registry->RegisterIntegerPref(
+ prefs::kDefaultAppsInstallState,
+ kUnknown,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
bool Provider::ShouldInstallInProfile() {
« no previous file with comments | « chrome/browser/extensions/default_apps.h ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698