| Index: chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
|
| diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
|
| index e643dd690d3702191a1eb3423feb56041b8e9639..df79adbc471170fea16aaab5a1647f94e2cecb09 100644
|
| --- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
|
| +++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
|
| @@ -56,9 +56,6 @@ void SyncConfirmationHandler::RegisterMessages() {
|
| 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)));
|
| @@ -66,12 +63,11 @@ void SyncConfirmationHandler::RegisterMessages() {
|
|
|
| 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) {
|
|
|