Make sure the new confirmation bubble is always shown upon signin

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
index 037cbde695a0790c8a4f879e847961cd012ce724..66588e77d177b1fb2c321a2ce7b191cfca133935 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -134,8 +134,7 @@ void InlineSigninHelper::OnSigninOAuthInformationAvailable(
 
     std::string is_constrained;
     net::GetValueForKeyInQuery(current_url_, "constrained", &is_constrained);
-    bool show_inline_confirmation_for_sync =
-        switches::IsNewAvatarMenu() && is_constrained == "1";
+    bool is_new_avatar_menu = switches::IsNewAvatarMenu();
 
     OneClickSigninSyncStarter::StartSyncMode start_mode;
     if (source == signin::SOURCE_SETTINGS || choose_what_to_sync_) {
@@ -147,16 +146,19 @@ void InlineSigninHelper::OnSigninOAuthInformationAvailable(
           OneClickSigninSyncStarter::SHOW_SETTINGS_WITHOUT_CONFIGURE :
           OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST;
     } else {
-      start_mode = show_inline_confirmation_for_sync ?
+      start_mode = is_new_avatar_menu ?
           OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST :
           OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
     }
 
+    // Suppress confirmation bubble when sign in through the new avatar menu,
+    // since a confirmation card will be automatically shown inside the existing
+    // avatar bubble.
     OneClickSigninSyncStarter::ConfirmationRequired confirmation_required =
         source == signin::SOURCE_SETTINGS ||
         source == signin::SOURCE_WEBSTORE_INSTALL ||
         choose_what_to_sync_ ||
-        show_inline_confirmation_for_sync ?
+        (is_new_avatar_menu &&  is_constrained == "1") ?
             OneClickSigninSyncStarter::NO_CONFIRMATION :
             OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
     bool start_signin =