| 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 42911c428336fa92f0b895d1458edc5cebfebf68..5501e0115d4ccc3bc7acfa8742b64b1874497033 100644
|
| --- a/chrome/browser/ui/webui/settings/people_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/people_handler.cc
|
| @@ -152,6 +152,19 @@ void ParseConfigurationArguments(const base::ListValue* args,
|
| NOTREACHED();
|
| }
|
|
|
| +std::string getSyncErrorAction(sync_ui_util::ActionType actionType) {
|
| + switch (actionType) {
|
| + case sync_ui_util::REAUTHENTICATE:
|
| + return "reauthenticate";
|
| + case sync_ui_util::UPGRADE_CLIENT:
|
| + return "upgradeClient";
|
| + case sync_ui_util::ENTER_PASSPHRASE:
|
| + return "enterPassphrase";
|
| + default:
|
| + return "noAction";
|
| + }
|
| +}
|
| +
|
| } // namespace
|
|
|
| namespace settings {
|
| @@ -731,13 +744,15 @@ PeopleHandler::GetSyncStatusDictionary() {
|
|
|
| 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());
|
|
|