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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 10808068: Store ChromeToMobile device list and timestamp prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add GetMobiles ownership/lifetime comment. Created 8 years, 5 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index babbefe42fd27e7a62d612996888acc9c552eb8e..2135b6f76fc1614aa9b2d3017ea499617627d148 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -108,6 +108,10 @@
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#endif
+#if !defined(OS_ANDROID)
+#include "chrome/browser/chrome_to_mobile_service.h"
+#endif
+
namespace {
enum MigratedPreferences {
@@ -210,6 +214,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
PrefsTabHelper::RegisterUserPrefs(user_prefs);
ProfileImpl::RegisterUserPrefs(user_prefs);
+ PromoResourceService::RegisterUserPrefs(user_prefs);
ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
SessionStartupPref::RegisterUserPrefs(user_prefs);
TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
@@ -234,9 +239,9 @@ void RegisterUserPrefs(PrefService* user_prefs) {
ash::RegisterChromeLauncherUserPrefs(user_prefs);
#endif
- PromoResourceService::RegisterUserPrefs(user_prefs);
#if !defined(OS_ANDROID)
AppsPromo::RegisterUserPrefs(user_prefs);
+ ChromeToMobileService::RegisterUserPrefs(user_prefs);
extensions::CommandService::RegisterUserPrefs(user_prefs);
extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
@@ -250,7 +255,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
PluginsUI::RegisterUserPrefs(user_prefs);
SyncPromoUI::RegisterUserPrefs(user_prefs);
printing::StickySettings::RegisterUserPrefs(user_prefs);
-
#endif
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/chrome_to_mobile_service_factory.cc ('k') | chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698