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

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 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/options/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 1528 matching lines @@
   sync_status->SetBoolean("signoutAllowed", !signout_prohibited);
   sync_status->SetBoolean("signinAllowed", signin->IsSigninAllowed());
   sync_status->SetBoolean("syncSystemEnabled", (service != NULL));
   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;

[Dan Beam, 2016/11/04 17:31:59]

nit: action_type

[Moe, 2016/11/04 21:34:09]

Done.

   bool status_has_error =
       sync_ui_util::GetStatusLabels(profile, service, *signin,
                                     sync_ui_util::WITH_HTML, &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->SetBoolean("managed", service && service->IsManaged());
   sync_status->SetBoolean("signedIn", signin->IsAuthenticated());
   sync_status->SetString("accountInfo",
                          l10n_util::GetStringFUTF16(
                              IDS_SYNC_ACCOUNT_INFO,
                              signin_ui_util::GetAuthenticatedUsername(signin)));
@@ skipping 666 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options