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

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac/ChromeOS builds and iOS tests. Created 4 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
Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
index 0fe1b98b9bcd6aec76da02e040e98acd193788fb..8d9ecfd32d35edaf73f796d2f325ad5828a38b0a 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -1127,7 +1127,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
- (IBAction)configureSyncSettings:(id)sender {
tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
LoginUIServiceFactory::GetForProfile(browser_->profile())->
- SyncConfirmationUIClosed(true);
+ SyncConfirmationUIClosed(LoginUIService::CONFIGURE_SYNC_FIRST);
ProfileMetrics::LogProfileNewAvatarMenuSignin(
ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_SETTINGS);
}
@@ -1135,7 +1135,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
- (IBAction)syncSettingsConfirmed:(id)sender {
tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
LoginUIServiceFactory::GetForProfile(browser_->profile())->
- SyncConfirmationUIClosed(false);
+ SyncConfirmationUIClosed(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
ProfileMetrics::LogProfileNewAvatarMenuSignin(
ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_OK);
[self initMenuContentsWithView:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER];
@@ -1174,7 +1174,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
- (void)windowWillClose:(NSNotification*)notification {
if (tutorialMode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN) {
LoginUIServiceFactory::GetForProfile(browser_->profile())->
- SyncConfirmationUIClosed(false);
+ SyncConfirmationUIClosed(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
}
[super windowWillClose:notification];
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698