diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_factory_impl.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_factory_impl_unittest.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
6 files changed, 13 insertions, 12 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index f7f3d17..5a785e5 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4767,11 +4767,11 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_SYNC_TABS_DESCRIPTION" desc="Description for the flag to enable syncing the open tabs datatype"> Enable open tabs in the sync options. This allows syncing your open tabs to other clients. </message> - <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME" desc="Title for the flag to enable syncing the app notifications datatype"> - Enable syncing app notifications + <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME" desc="Title for the flag to disable syncing the app notifications datatype"> + Disable syncing app notifications </message> - <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION" desc="Description for the flag to enable syncing the app notifications datatype"> - Enable app notifications in the sync options. This allows syncing notifications received from your apps to other clients. + <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION" desc="Description for the flag to disable syncing the app notifications datatype"> + Disable app notifications in the sync options. This turns off syncing notifications received from your apps to other clients. </message> <if expr="pp_ifdef('android')"> <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype"> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 43f8045..60a4790 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -294,7 +294,7 @@ const Experiment kExperiments[] = { IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME, IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableSyncAppNotifications) + SINGLE_VALUE_TYPE(switches::kDisableSyncAppNotifications) }, { "enable-smooth-scrolling", // FLAGS:RECORD_UMA diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc index a820419..c31e2c6 100644 --- a/chrome/browser/sync/profile_sync_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_factory_impl.cc @@ -183,9 +183,9 @@ void ProfileSyncFactoryImpl::RegisterDataTypes(ProfileSyncService* pss) { new AutofillProfileDataTypeController(this, profile_)); } - // App notifications sync is disabled by default. Register only if - // explicitly enabled. - if (command_line_->HasSwitch(switches::kEnableSyncAppNotifications)) { + // App notifications sync is enabled by default. Register only if + // explicitly disabled. + if (!command_line_->HasSwitch(switches::kDisableSyncAppNotifications)) { pss->RegisterDataTypeController( new AppNotificationDataTypeController(this, profile_, pss)); } diff --git a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc index 91b5e96..4b9dd5881 100644 --- a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc @@ -41,6 +41,7 @@ class ProfileSyncFactoryImplTest : public testing::Test { datatypes.push_back(syncable::THEMES); datatypes.push_back(syncable::EXTENSIONS); datatypes.push_back(syncable::APPS); + datatypes.push_back(syncable::APP_NOTIFICATIONS); datatypes.push_back(syncable::AUTOFILL_PROFILE); datatypes.push_back(syncable::PASSWORDS); datatypes.push_back(syncable::TYPED_URLS); diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 5251a7f..a8459c5 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -315,6 +315,9 @@ const char kDisableSync[] = "disable-sync"; // Disables syncing of apps. const char kDisableSyncApps[] = "disable-sync-apps"; +// Disable syncing app notifications. +const char kDisableSyncAppNotifications[] = "disable-sync-app-notifications"; + // Disables syncing of autofill. const char kDisableSyncAutofill[] = "disable-sync-autofill"; @@ -556,9 +559,6 @@ const char kEnableSyncTabs[] = "enable-sync-tabs"; const char kEnableSyncTabsForOtherClients[] = "enable-sync-tabs-for-other-clients"; -// Enable syncing app notifications. -const char kEnableSyncAppNotifications[] = "enable-sync-app-notifications"; - // Enables context menu for selecting groups of tabs. const char kEnableTabGroupsContextMenu[] = "enable-tab-groups-context-menu"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index efa2030..168feb4 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -95,6 +95,7 @@ extern const char kDisableSiteSpecificQuirks[]; extern const char kDisableSSL3[]; extern const char kDisableSync[]; extern const char kDisableSyncApps[]; +extern const char kDisableSyncAppNotifications[]; extern const char kDisableSyncAutofill[]; extern const char kDisableSyncAutofillProfile[]; extern const char kDisableSyncBookmarks[]; @@ -160,7 +161,6 @@ extern const char kEnableSyncExtensionSettings[]; extern const char kEnableSyncOAuth[]; extern const char kEnableSyncTabs[]; extern const char kEnableSyncTabsForOtherClients[]; -extern const char kEnableSyncAppNotifications[]; extern const char kEnableSyncedBookmarksFolder[]; extern const char kEnableTabGroupsContextMenu[]; extern const char kEnableTopSites[]; |