diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/sync_setup_overlay.html | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_handler.cc | 7 |
5 files changed, 22 insertions, 12 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a86e67c..60895f9 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -13509,9 +13509,7 @@ Some features may be unavailable. Please check that the profile exists and you Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Sync is disabled by your administrator. </message> <message name="IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED" desc="The message that appears in the options dialog indicating that user is signed in with the given email address, but sync has been stopped."> - Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. - <ph name="LINE_BREAK"><br /><ex><br /></ex></ph> - Sync has been stopped on this device. Manage your synced data on <ph name="BEGIN_LINK"><a href="$2" target="_blank"><ex><a href="$2" target="_blank"></ex></ph>Google Dashboard<ph name="END_LINK"></a><ex></a></ex></ph>. + Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Sync has been stopped via the Google Dashboard. </message> <message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER" desc="The message that appears in the options dialog indicating that account is syncing to a user with the given email address."> Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html index 3aa0d3e..f0bdfd3 100644 --- a/chrome/browser/resources/sync_setup_overlay.html +++ b/chrome/browser/resources/sync_setup_overlay.html @@ -34,7 +34,11 @@ <select id="sync-select-datatypes"> <option i18n-content="syncAllDataTypes" selected></option> <option i18n-content="chooseDataTypes"></option> - <option i18n-content="syncNothing"></option> + <!-- The syncNothing element is to be hidden for M29. + TODO(rsimha): Revisit this for M30. + See http://crbug.com/252049. + --> + <option i18n-content="syncNothing" hidden></option> </select> <div id="choose-data-types-body"> <div id="apps-item" class="sync-type-checkbox checkbox"> diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index e9857e5..8a61a2e 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -1201,8 +1201,12 @@ void ProfileSyncService::OnActionableError(const SyncProtocolError& error) { break; case syncer::DISABLE_SYNC_ON_CLIENT: OnStopSyncingPermanently(); - // TODO(rsimha): Re-evaluate whether to also sign out the user here after - // a dashboard clear. See http://crbug.com/240436. +#if !defined(OS_CHROMEOS) + // On desktop Chrome, sign out the user after a dashboard clear. + // TODO(rsimha): Revisit this for M30. See http://crbug.com/252049. + if (!auto_start_enabled_) // Skip sign out on ChromeOS/Android. + SigninManagerFactory::GetForProfile(profile_)->SignOut(); +#endif break; case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT: // Sync disabled by domain admin. we should stop syncing until next diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 46aebd5..645bc4c 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -56,10 +56,8 @@ string16 GetSyncedStateStatusLabel(ProfileSyncService* service, user_name); } else if (service->IsStartSuppressed()) { // User is signed in, but sync has been stopped. - return l10n_util::GetStringFUTF16( - IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED, - user_name, - ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); + return l10n_util::GetStringFUTF16(IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED, + user_name); } } @@ -253,8 +251,7 @@ MessageType GetStatusInfo(ProfileSyncService* service, if (status_label) { string16 label = l10n_util::GetStringFUTF16( IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED, - UTF8ToUTF16(signin.GetAuthenticatedUsername()), - ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); + UTF8ToUTF16(signin.GetAuthenticatedUsername())); status_label->assign(label); result_type = PRE_SYNCED; } diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 5d353d9..11085ea 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -932,6 +932,13 @@ void SyncSetupHandler::CloseSyncSetup() { if (sync_service) { DVLOG(1) << "Sync setup aborted by user action"; sync_service->OnStopSyncingPermanently(); +#if !defined(OS_CHROMEOS) + // Sign out the user on desktop Chrome if they click cancel during + // initial setup. + // TODO(rsimha): Revisit this for M30. See http://crbug.com/252049. + if (sync_service->FirstSetupInProgress()) + SigninManagerFactory::GetForProfile(GetProfile())->SignOut(); +#endif } } |