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 acdefbaa24fc86cbe8ceaecdcadce613d759b717..0a666e62b13fe3ac0090e064d1c17cd4649b869a 100644 |
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
@@ -12,6 +12,8 @@ |
#include "chrome/browser/extensions/extension_system_factory.h" |
#include "chrome/browser/history/history.h" |
#include "chrome/browser/history/history_service_factory.h" |
+#include "chrome/browser/notifier/chrome_notifier_service.h" |
+#include "chrome/browser/notifier/chrome_notifier_service_factory.h" |
#include "chrome/browser/prefs/pref_model_associator.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -223,6 +225,14 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
new UIDataTypeController( |
syncer::HISTORY_DELETE_DIRECTIVES, this, profile_, pss)); |
} |
+ |
+ // Synced Notifications sync is disabled by default. |
+ // TODO(petewil): Switch to enabled by default once datatype support is done. |
Nico
2013/01/31 22:43:14
add link to tracking bug
Pete Williamson
2013/01/31 23:02:40
This is work on the server sync side - is it OK to
Nico
2013/01/31 23:28:20
Ah. No, just add "server side" to the comment some
|
+ if (command_line_->HasSwitch(switches::kEnableSyncSyncedNotifications)) { |
+ pss->RegisterDataTypeController( |
+ new UIDataTypeController( |
+ syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); |
+ } |
} |
DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
@@ -297,6 +307,15 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl:: |
profile_, Profile::EXPLICIT_ACCESS); |
return history ? history->AsWeakPtr() : base::WeakPtr<HistoryService>(); |
} |
+ |
+ case syncer::SYNCED_NOTIFICATIONS: { |
+ notifier::ChromeNotifierService* notifier_service = |
+ notifier::ChromeNotifierServiceFactory::GetForProfile( |
+ profile_, Profile::EXPLICIT_ACCESS); |
+ return notifier_service ? notifier_service->AsWeakPtr() |
+ : base::WeakPtr<notifier::ChromeNotifierService>(); |
+ } |
+ |
default: |
// The following datatypes still need to be transitioned to the |
// syncer::SyncableService API: |