Adding parameter to GetStatusLabels to indicate if links are acceptable. (Re applied)

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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/sync/profile_sync_service.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <map>
 #include <set>
@@ skipping 978 matching lines @@
   if (backend_.get() && backend_initialized_) {
     return backend_->GetDetailedStatus();
   } else {
     SyncBackendHost::Status status;
     status.summary = SyncBackendHost::Status::OFFLINE_UNUSABLE;
     status.sync_protocol_error = last_actionable_error_;
     return status;
   }
 }
 
+const GoogleServiceAuthError& ProfileSyncService::GetAuthError() const {
+  return last_auth_error_;
+}
+
 bool ProfileSyncService::SetupInProgress() const {
   return !HasSyncSetupCompleted() && WizardIsVisible();
 }
 
 std::string ProfileSyncService::BuildSyncStatusSummaryText(
     const sync_api::SyncManager::Status::Summary& summary) {
   const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
       "READY", "CONFLICT", "OFFLINE_UNUSABLE"};
   COMPILE_ASSERT(arraysize(strings) ==
                  sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
                  enum_indexed_array);
   if (summary < 0 ||
       summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) {
     LOG(DFATAL) << "Illegal Summary Value: " << summary;
     return "UNKNOWN";
   }
   return strings[summary];
 }
 
 bool ProfileSyncService::sync_initialized() const {
   return backend_initialized_;
 }
 
 bool ProfileSyncService::unrecoverable_error_detected() const {
   return unrecoverable_error_detected_;
 }
 
+bool ProfileSyncService::UIShouldDepictAuthInProgress() const {
+  return is_auth_in_progress_;
+}
+
 bool ProfileSyncService::IsPassphraseRequired() const {
   return passphrase_required_reason_ !=
       sync_api::REASON_PASSPHRASE_NOT_REQUIRED;
 }
 
 // TODO(zea): Rename this IsPassphraseNeededFromUI and ensure it's used
 // appropriately (see http://crbug.com/91379).
 bool ProfileSyncService::IsPassphraseRequiredForDecryption() const {
   // If there is an encrypted datatype enabled and we don't have the proper
   // passphrase, we must prompt the user for a passphrase. The only way for the
@@ skipping 513 matching lines @@
             << "Unrecoverable error.";
   } else {
     VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
             << "initialized";
   }
 }
 
 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
   return failed_datatypes_handler_;
 }