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

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Issue 2614703002: Remove the temporary flag to disable the sync confirmation page on linux an windows. (Closed)
Patch Set: Remove the temporary flag to disable the sync confirmation page on linux an windows. Created 3 years, 11 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
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 80a1aeebf208270de5e767c731152c566e8bf688..4b36627f5a2fe37738be16ef01465fd7087209dc 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -322,7 +322,14 @@ void OneClickSigninSyncStarter::CompleteInitForNewProfile(
FinishProfileSyncServiceSetup();
Initialize(new_profile, nullptr);
DCHECK_EQ(profile_, new_profile);
+
+#if defined(OS_MACOSX)
+ // On macOS, the sync confirmation dialog is web-contents modal and thus
+ // it is dismissed on tab navigation (which always occurs when signing in
+ // to a new profile).
+ // Skip sync confirmation on macOS to workaround this issue.
skip_sync_confirm_ = true;
+#endif
// We've transferred our credentials to the new profile - notify that
// the signin for the original profile was cancelled (must do this after
@@ -494,10 +501,6 @@ void OneClickSigninSyncStarter::AccountAddedToCookie(
// Regardless of whether the account was successfully added or not,
// continue with sync starting.
- // TODO(zmin): Remove this hack once the https://crbug.com/657924 fixed.
- // Skip the Sync confirmation dialog if user choose to create a new profile
- // for the corp signin. This is because the dialog doesn't work properly
- // after the corp signin.
if (skip_sync_confirm_) {
OnSyncConfirmationUIClosed(LoginUIService::ABORT_SIGNIN);
return;
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698