- OneClickSigninSyncStarter::StartSyncMode start_mode =
- source == signin::SOURCE_SETTINGS || choose_what_to_sync_ ?
- (error_controller->HasError() &&
- sync_service && sync_service->HasSyncSetupCompleted()) ?
- OneClickSigninSyncStarter::SHOW_SETTINGS_WITHOUT_CONFIGURE :
- OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST :
- OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
- OneClickSigninSyncStarter::ConfirmationRequired confirmation_required =
- source == signin::SOURCE_SETTINGS ||
- source == signin::SOURCE_WEBSTORE_INSTALL ||
- choose_what_to_sync_ ?
- OneClickSigninSyncStarter::NO_CONFIRMATION :
- OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
+
+ bool is_new_avatar_menu = switches::IsNewAvatarMenu();
+
+ OneClickSigninSyncStarter::StartSyncMode start_mode;
+ if (source == signin::SOURCE_SETTINGS || choose_what_to_sync_) {
+ bool show_settings_without_configure =
+ error_controller->HasError() &&
+ sync_service &&
+ sync_service->HasSyncSetupCompleted();
+ start_mode = show_settings_without_configure ?
+ OneClickSigninSyncStarter::SHOW_SETTINGS_WITHOUT_CONFIGURE :
+ OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST;
+ } else {
+ start_mode = is_new_avatar_menu ?
+ OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST :
+ OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
+ }
+
+ OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
+ if (confirm_untrusted_signin_) {
+ confirmation_required =
+ OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN;
+ } else if (is_new_avatar_menu) {
+ confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
+ } else {
+ confirmation_required =
+ source == signin::SOURCE_SETTINGS ||
+ source == signin::SOURCE_WEBSTORE_INSTALL ||
+ choose_what_to_sync_ ?
+ OneClickSigninSyncStarter::NO_CONFIRMATION :
+ OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
+ }