Chromium Code Reviews| 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 dc447fc72d89a3efbba106010c306f8f35cd1823..c8d7cf64784687d09b5554f091062939f585e2d7 100644 |
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
| +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
| @@ -59,6 +59,7 @@ |
| #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
| #include "chrome/browser/webdata/web_data_service.h" |
| #include "chrome/common/chrome_switches.h" |
| +#include "chrome/common/chrome_version_info.h" |
| #include "chrome/common/pref_names.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "sync/api/syncable_service.h" |
| @@ -240,12 +241,17 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
| // Synced Notifications sync is disabled by default. |
| // TODO(petewil): Switch to enabled by default once datatype support is done. |
| - if (command_line_->HasSwitch(switches::kEnableSyncSyncedNotifications)) { |
| + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| + if (!command_line_->HasSwitch(switches::kDisableSyncSyncedNotifications)) { |
| + if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || |
| + channel == chrome::VersionInfo::CHANNEL_CANARY || |
| + channel == chrome::VersionInfo::CHANNEL_DEV) { |
| #if !defined(OS_ANDROID) |
|
Nicolas Zea
2013/03/20 22:37:03
FYI, you can get rid of this #if. RegisterDesktopD
|
| - pss->RegisterDataTypeController( |
| - new UIDataTypeController( |
| - syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); |
| + pss->RegisterDataTypeController( |
| + new UIDataTypeController( |
| + syncer::SYNCED_NOTIFICATIONS, this, profile_, pss)); |
| #endif |
| + } |
| } |
| #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |