Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 8383036: Adding parameter to GetStatusLabels to indicate if links are acceptable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix! Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 if (backend_.get() && backend_initialized_) { 989 if (backend_.get() && backend_initialized_) {
990 return backend_->GetDetailedStatus(); 990 return backend_->GetDetailedStatus();
991 } else { 991 } else {
992 SyncBackendHost::Status status; 992 SyncBackendHost::Status status;
993 status.summary = SyncBackendHost::Status::OFFLINE_UNUSABLE; 993 status.summary = SyncBackendHost::Status::OFFLINE_UNUSABLE;
994 status.sync_protocol_error = last_actionable_error_; 994 status.sync_protocol_error = last_actionable_error_;
995 return status; 995 return status;
996 } 996 }
997 } 997 }
998 998
999 const GoogleServiceAuthError& ProfileSyncService::GetAuthError() const {
1000 return last_auth_error_;
1001 }
1002
999 bool ProfileSyncService::SetupInProgress() const { 1003 bool ProfileSyncService::SetupInProgress() const {
1000 return !HasSyncSetupCompleted() && WizardIsVisible(); 1004 return !HasSyncSetupCompleted() && WizardIsVisible();
1001 } 1005 }
1002 1006
1003 std::string ProfileSyncService::BuildSyncStatusSummaryText( 1007 std::string ProfileSyncService::BuildSyncStatusSummaryText(
1004 const sync_api::SyncManager::Status::Summary& summary) { 1008 const sync_api::SyncManager::Status::Summary& summary) {
1005 const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING", 1009 const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
1006 "READY", "CONFLICT", "OFFLINE_UNUSABLE"}; 1010 "READY", "CONFLICT", "OFFLINE_UNUSABLE"};
1007 COMPILE_ASSERT(arraysize(strings) == 1011 COMPILE_ASSERT(arraysize(strings) ==
1008 sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT, 1012 sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
1009 enum_indexed_array); 1013 enum_indexed_array);
1010 if (summary < 0 || 1014 if (summary < 0 ||
1011 summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) { 1015 summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) {
1012 LOG(DFATAL) << "Illegal Summary Value: " << summary; 1016 LOG(DFATAL) << "Illegal Summary Value: " << summary;
1013 return "UNKNOWN"; 1017 return "UNKNOWN";
1014 } 1018 }
1015 return strings[summary]; 1019 return strings[summary];
1016 } 1020 }
1017 1021
1018 bool ProfileSyncService::sync_initialized() const { 1022 bool ProfileSyncService::sync_initialized() const {
1019 return backend_initialized_; 1023 return backend_initialized_;
1020 } 1024 }
1021 1025
1022 bool ProfileSyncService::unrecoverable_error_detected() const { 1026 bool ProfileSyncService::unrecoverable_error_detected() const {
1023 return unrecoverable_error_detected_; 1027 return unrecoverable_error_detected_;
1024 } 1028 }
1025 1029
1030 bool ProfileSyncService::UIShouldDepictAuthInProgress() const {
1031 return is_auth_in_progress_;
1032 }
1033
1026 bool ProfileSyncService::IsPassphraseRequired() const { 1034 bool ProfileSyncService::IsPassphraseRequired() const {
1027 return passphrase_required_reason_ != 1035 return passphrase_required_reason_ !=
1028 sync_api::REASON_PASSPHRASE_NOT_REQUIRED; 1036 sync_api::REASON_PASSPHRASE_NOT_REQUIRED;
1029 } 1037 }
1030 1038
1031 bool ProfileSyncService::IsPassphraseRequiredForDecryption() const { 1039 bool ProfileSyncService::IsPassphraseRequiredForDecryption() const {
1032 return IsEncryptedDatatypeEnabled() && 1040 return IsEncryptedDatatypeEnabled() &&
1033 (passphrase_required_reason_ == sync_api::REASON_DECRYPTION || 1041 (passphrase_required_reason_ == sync_api::REASON_DECRYPTION ||
1034 passphrase_required_reason_ == sync_api::REASON_SET_PASSPHRASE_FAILED); 1042 passphrase_required_reason_ == sync_api::REASON_SET_PASSPHRASE_FAILED);
1035 } 1043 }
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 << "Unrecoverable error."; 1549 << "Unrecoverable error.";
1542 } else { 1550 } else {
1543 VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not " 1551 VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
1544 << "initialized"; 1552 << "initialized";
1545 } 1553 }
1546 } 1554 }
1547 1555
1548 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() { 1556 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
1549 return failed_datatypes_handler_; 1557 return failed_datatypes_handler_;
1550 } 1558 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698