chrome/browser/ui/views/profiles/profile_chooser_view.cc - Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

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: Move strings to resources and properly enable the settings link. Created 5 years 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

« chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/profiles/signin_view_controller.h » ('j') | chrome/browser/ui/views/profiles/signin_view_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc

diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc

index 27d9686be11cf48875fa17fc91ebd40eb3cd502d..3220756f708680138a32a9f9dc1130b5a2ff0dca 100644

--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc

+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc

@@ -855,7 +855,7 @@ void ProfileChooserView::WindowClosing() {

if (tutorial_mode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN) {

LoginUIServiceFactory::GetForProfile(browser_->profile())->

- SyncConfirmationUIClosed(false /* configure_sync_first */);

+ SyncConfirmationUIClosed(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);

}

@@ -903,7 +903,7 @@ void ProfileChooserView::ButtonPressed(views::Button* sender,

ShowViewFromMode(profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH);

} else if (sender == tutorial_sync_settings_ok_button_) {

LoginUIServiceFactory::GetForProfile(browser_->profile())->

- SyncConfirmationUIClosed(false /* configure_sync_first */);

+ SyncConfirmationUIClosed(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);

DismissTutorial();

ProfileMetrics::LogProfileNewAvatarMenuSignin(

ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_OK);

@@ -1004,7 +1004,7 @@ void ProfileChooserView::LinkClicked(views::Link* sender, int event_flags) {

PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_ADD_ACCT);

} else if (sender == tutorial_sync_settings_link_) {

LoginUIServiceFactory::GetForProfile(browser_->profile())->

- SyncConfirmationUIClosed(true /* configure_sync_first */);

+ SyncConfirmationUIClosed(LoginUIService::CONFIGURE_SYNC_FIRST);

tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;

ProfileMetrics::LogProfileNewAvatarMenuSignin(

ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_SETTINGS);