| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 | 226 |
| 227 // Pretty-printed strings for a given StatusSummary. | 227 // Pretty-printed strings for a given StatusSummary. |
| 228 static std::string BuildSyncStatusSummaryText( | 228 static std::string BuildSyncStatusSummaryText( |
| 229 const browser_sync::SyncBackendHost::StatusSummary& summary); | 229 const browser_sync::SyncBackendHost::StatusSummary& summary); |
| 230 | 230 |
| 231 // Returns true if the SyncBackendHost has told us it's ready to accept | 231 // Returns true if the SyncBackendHost has told us it's ready to accept |
| 232 // changes. | 232 // changes. |
| 233 // TODO(timsteele): What happens if the bookmark model is loaded, a change | 233 // TODO(timsteele): What happens if the bookmark model is loaded, a change |
| 234 // takes place, and the backend isn't initialized yet? | 234 // takes place, and the backend isn't initialized yet? |
| 235 bool sync_initialized() const { return backend_initialized_; } | 235 bool sync_initialized() const { return backend_initialized_; } |
| 236 virtual bool unrecoverable_error_detected() const { | 236 virtual bool unrecoverable_error_detected() const; |
| 237 return unrecoverable_error_detected_; | |
| 238 } | |
| 239 const std::string& unrecoverable_error_message() { | 237 const std::string& unrecoverable_error_message() { |
| 240 return unrecoverable_error_message_; | 238 return unrecoverable_error_message_; |
| 241 } | 239 } |
| 242 tracked_objects::Location unrecoverable_error_location() { | 240 tracked_objects::Location unrecoverable_error_location() { |
| 243 return unrecoverable_error_location_.get() ? | 241 return unrecoverable_error_location_.get() ? |
| 244 *unrecoverable_error_location_.get() : tracked_objects::Location(); | 242 *unrecoverable_error_location_.get() : tracked_objects::Location(); |
| 245 } | 243 } |
| 246 | 244 |
| 247 bool UIShouldDepictAuthInProgress() const { | 245 bool UIShouldDepictAuthInProgress() const { |
| 248 return is_auth_in_progress_; | 246 return is_auth_in_progress_; |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 // and is necessary because the nudge sync framework can drop nudges for | 533 // and is necessary because the nudge sync framework can drop nudges for |
| 536 // a wide variety of sync-related conditions (throttling, connections issues, | 534 // a wide variety of sync-related conditions (throttling, connections issues, |
| 537 // syncer paused, etc.). It can only be removed correctly when the framework | 535 // syncer paused, etc.). It can only be removed correctly when the framework |
| 538 // is reworked to allow one-shot commands like clearing server data. | 536 // is reworked to allow one-shot commands like clearing server data. |
| 539 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_; | 537 base::OneShotTimer<ProfileSyncService> clear_server_data_timer_; |
| 540 | 538 |
| 541 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 539 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 542 }; | 540 }; |
| 543 | 541 |
| 544 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 542 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |