Make sure the new confirmation bubble is always shown upon signin

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 120 matching lines @@
           handler_,
           signin::ShouldShowAccountManagement(current_url_)));
     }
   } else {
     ProfileSyncService* sync_service =
         ProfileSyncServiceFactory::GetForProfile(profile_);
     SigninErrorController* error_controller =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
             signin_error_controller();
 
-    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_) {
       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 = show_inline_confirmation_for_sync ?
+      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_ ||
-          show_inline_confirmation_for_sync ?
+          choose_what_to_sync_ ?
               OneClickSigninSyncStarter::NO_CONFIRMATION :
               OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
     }
 
     bool start_signin =
         !OneClickSigninHelper::HandleCrossAccountError(
             profile_, "",
             email, password_, refresh_token,
             OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT,
             source, start_mode,
@@ skipping 259 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }