Sync confirmation: change "Settings" link to checkbox

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

 // Copyright 2015 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/sync_confirmation_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 38 matching lines @@
   if (browser_ == browser)
     browser_ = nullptr;
 }
 
 void SyncConfirmationHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("confirm",
       base::Bind(&SyncConfirmationHandler::HandleConfirm,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("undo",
       base::Bind(&SyncConfirmationHandler::HandleUndo, base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("goToSettings",
-      base::Bind(&SyncConfirmationHandler::HandleGoToSettings,
-                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("initializedWithSize",
       base::Bind(&SyncConfirmationHandler::HandleInitializedWithSize,
                  base::Unretained(this)));
 }
 
 void SyncConfirmationHandler::HandleConfirm(const base::ListValue* args) {
   did_user_explicitly_interact = true;
-  CloseModalSigninWindow(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
-}
-
-void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {
-  did_user_explicitly_interact = true;
-  CloseModalSigninWindow(LoginUIService::CONFIGURE_SYNC_FIRST);
+  bool configure_sync_first = false;
+  CHECK(args->GetBoolean(0, &configure_sync_first));
+  CloseModalSigninWindow(configure_sync_first
+                             ? LoginUIService::CONFIGURE_SYNC_FIRST
+                             : LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
 }
 
 void SyncConfirmationHandler::HandleUndo(const base::ListValue* args) {
   did_user_explicitly_interact = true;
   base::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
   LoginUIServiceFactory::GetForProfile(profile_)->SyncConfirmationUIClosed(
       LoginUIService::ABORT_SIGNIN);
   SigninManagerFactory::GetForProfile(profile_)->SignOut(
       signin_metrics::ABORT_SIGNIN,
       signin_metrics::SignoutDelete::IGNORE_METRIC);
@@ skipping 63 matching lines @@
 
   signin::SetInitializedModalHeight(browser_, web_ui(), args);
 
   // After the dialog is shown, some platforms might have an element focused.
   // To be consistent, clear the focused element on all platforms.
   // TODO(anthonyvd): Figure out why this is needed on Mac and not other
   // platforms and if there's a way to start unfocused while avoiding this
   // workaround.
   web_ui()->CallJavascriptFunctionUnsafe("sync.confirmation.clearFocus");
 }