Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6825)

Unified Diff: chrome/browser/ui/webui/signin/sync_confirmation_handler.cc

Issue 1806353002: Enhanced Sync Confirmation modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 df51a0d195a06e803804e9a1cb407d2a7358a3e3..188f8a8915bb50736d1aafbecf1b8ad77c72d680 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/webui/signin/sync_confirmation_handler.h"
+#include <vector>
+
#include "base/bind.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
#include "chrome/browser/signin/account_tracker_service_factory.h"
@@ -41,7 +43,13 @@ void SyncConfirmationHandler::RegisterMessages() {
}
void SyncConfirmationHandler::HandleConfirm(const base::ListValue* args) {
- CloseModalSigninWindow(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
+ bool open_activity_controls = false;
+ bool success = args->GetBoolean(0, &open_activity_controls);
+ DCHECK(success);
+ LoginUIService::SyncConfirmationUIClosedResults results =
+ open_activity_controls ? LoginUIService::SYNC_WITH_ACTIVITY_CONTROLS:
+ LoginUIService::SYNC_WITH_DEFAULT_SETTINGS;
+ CloseModalSigninWindow(results);
}
void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {

Powered by Google App Engine
This is Rietveld 408576698