Settings People Revamp: Add special Disconnect logic for domain profiles

chrome/browser/ui/webui/settings/people_handler.cc

Index: chrome/browser/ui/webui/settings/people_handler.cc
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 22ac4b4dc8861ea164e278a303df303edbda4655..6eaeb244d5086611b41a3fe53d2a2fc647471091 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -512,19 +512,23 @@ void PeopleHandler::HandleStartSignin(const base::ListValue* args) {
 }
 
 void PeopleHandler::HandleStopSyncing(const base::ListValue* args) {
-  if (GetSyncService())
-    ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
-
   bool delete_profile = false;
   args->GetBoolean(0, &delete_profile);
-  signin_metrics::SignoutDelete delete_metric =
-      delete_profile ? signin_metrics::SignoutDelete::DELETED
-                     : signin_metrics::SignoutDelete::KEEPING;
-  SigninManagerFactory::GetForProfile(profile_)
-      ->SignOut(signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS, delete_metric);
+  bool domain_managed_profile = false;
+  args->GetBoolean(0, &domain_managed_profile);
+
+  if (!domain_managed_profile) {

[dpapad, 2016/06/28 22:17:22]

Same question here. Why are we trusting JS for this boolean? Is it safe?

[tommycli, 2016/06/28 23:26:00]

Done. It was the way before just because I was copying Options.

But I agree - I think just retrieving this value on the C++ side is cleaner.

+    if (GetSyncService())
+      ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
+
+    signin_metrics::SignoutDelete delete_metric =
+        delete_profile ? signin_metrics::SignoutDelete::DELETED
+                       : signin_metrics::SignoutDelete::KEEPING;
+    SigninManagerFactory::GetForProfile(profile_)
+        ->SignOut(signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS, delete_metric);
+  }
 
   if (delete_profile) {
-    // Do as BrowserOptionsHandler::DeleteProfile().
     webui::DeleteProfileAtPath(profile_->GetPath(),
                                web_ui(),
                                ProfileMetrics::DELETE_PROFILE_SETTINGS);