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

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 9515010: Chrome on Android : Begin removing references to themes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index a8eba4a6f5377c501e0f2c7034dfa851c04669fd..c5ef8d3acc38b0108fed9601bd00174e96855279 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -131,11 +131,13 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
new UIDataTypeController(syncable::PREFERENCES, this, profile_, pss));
}
+#if defined(ENABLE_THEMES)
// Theme sync is enabled by default. Register unless explicitly disabled.
if (!command_line_->HasSwitch(switches::kDisableSyncThemes)) {
pss->RegisterDataTypeController(
new ThemeDataTypeController(this, profile_, pss));
}
+#endif
// TypedUrl sync is enabled by default. Register unless explicitly disabled,
// or if saving history is disabled.
@@ -294,6 +296,7 @@ ProfileSyncComponentsFactory::SyncComponents
return SyncComponents(model_associator, change_processor);
}
+#if defined(ENABLE_THEMES)
ProfileSyncComponentsFactory::SyncComponents
ProfileSyncComponentsFactoryImpl::CreateThemeSyncComponents(
ProfileSyncService* profile_sync_service,
@@ -304,6 +307,7 @@ ProfileSyncComponentsFactory::SyncComponents
new ThemeChangeProcessor(error_handler);
return SyncComponents(model_associator, change_processor);
}
+#endif
ProfileSyncComponentsFactory::SyncComponents
ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents(
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.h ('k') | chrome/browser/sync/profile_sync_components_factory_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698