[MD Settings][Sync Settings] Updates sync status messages

chrome/browser/ui/webui/settings/people_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/settings/people_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 134 matching lines @@
 void ParseConfigurationArguments(const base::ListValue* args,
                                  SyncConfigInfo* config,
                                  const base::Value** callback_id) {
   std::string json;
   if (args->Get(0, callback_id) && args->GetString(1, &json) && !json.empty())
     CHECK(GetConfiguration(json, config));
   else
     NOTREACHED();
 }
 
+std::string getSyncErrorAction(sync_ui_util::ActionType actionType) {
+  switch (actionType) {
+    case sync_ui_util::REAUTHENTICATE:
+      return std::string("reauthenticate");

[tommycli, 2016/10/28 21:21:09]

nit: are you sure it's necessary to wrap all these return values in std::string
constructor?

[Moe, 2016/11/01 19:44:01]

Done.

+    case sync_ui_util::UPGRADE_CLIENT:
+      return std::string("upgradeClient");
+    case sync_ui_util::ENTER_PASSPHRASE:
+      return std::string("enterPassphrase");
+    default:
+      return std::string("noAction");
+  }
+}
+
 }  // namespace
 
 namespace settings {
 
 // static
 const char PeopleHandler::kSpinnerPageStatus[] = "spinner";
 const char PeopleHandler::kConfigurePageStatus[] = "configure";
 const char PeopleHandler::kTimeoutPageStatus[] = "timeout";
 const char PeopleHandler::kDonePageStatus[] = "done";
 const char PeopleHandler::kPassphraseFailedPageStatus[] = "passphraseFailed";
@@ skipping 559 matching lines @@
   sync_status->SetBoolean("signinAllowed", signin->IsSigninAllowed());
   sync_status->SetBoolean("syncSystemEnabled", (service != nullptr));
   sync_status->SetBoolean("setupCompleted",
                           service && service->IsFirstSetupComplete());
   sync_status->SetBoolean(
       "setupInProgress",
       service && !service->IsManaged() && service->IsFirstSetupInProgress());
 
   base::string16 status_label;
   base::string16 link_label;
+  sync_ui_util::ActionType actionType(sync_ui_util::NO_ACTION);
   bool status_has_error =
       sync_ui_util::GetStatusLabels(profile_, service, *signin,
                                     sync_ui_util::PLAIN_TEXT, &status_label,
-                                    &link_label) == sync_ui_util::SYNC_ERROR;
+                                    &link_label, &actionType) ==
+      sync_ui_util::SYNC_ERROR;
   sync_status->SetString("statusText", status_label);
-  sync_status->SetString("actionLinkText", link_label);
   sync_status->SetBoolean("hasError", status_has_error);
+  sync_status->SetString("statusAction", getSyncErrorAction(actionType));
 
   sync_status->SetBoolean("managed", service && service->IsManaged());
   sync_status->SetBoolean("signedIn", signin->IsAuthenticated());
   sync_status->SetString("signedInUsername",
                          signin_ui_util::GetAuthenticatedUsername(signin));
   sync_status->SetBoolean("hasUnrecoverableError",
                           service && service->HasUnrecoverableError());
 
   return sync_status;
 }
@@ skipping 150 matching lines @@
   base::FilePath profile_file_path = profile_->GetPath();
   ProfileMetrics::LogProfileSyncSignIn(profile_file_path);
 
   // We're done configuring, so notify ProfileSyncService that it is OK to
   // start syncing.
   sync_blocker_.reset();
   service->SetFirstSetupComplete();
 }
 
 }  // namespace settings