| OLD | NEW |
| 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 #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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 // single thread. If we want multiple threads to access this(and there is | 279 // single thread. If we want multiple threads to access this(and there is |
| 280 // currently no need to do so) we need to protect this with a lock. | 280 // currently no need to do so) we need to protect this with a lock. |
| 281 // TODO(timsteele): What happens if the bookmark model is loaded, a change | 281 // TODO(timsteele): What happens if the bookmark model is loaded, a change |
| 282 // takes place, and the backend isn't initialized yet? | 282 // takes place, and the backend isn't initialized yet? |
| 283 bool sync_initialized() const { return backend_initialized_; } | 283 bool sync_initialized() const { return backend_initialized_; } |
| 284 virtual bool unrecoverable_error_detected() const; | 284 virtual bool unrecoverable_error_detected() const; |
| 285 const std::string& unrecoverable_error_message() { | 285 const std::string& unrecoverable_error_message() { |
| 286 return unrecoverable_error_message_; | 286 return unrecoverable_error_message_; |
| 287 } | 287 } |
| 288 tracked_objects::Location unrecoverable_error_location() { | 288 tracked_objects::Location unrecoverable_error_location() { |
| 289 return unrecoverable_error_location_.get() ? | 289 return unrecoverable_error_location_; |
| 290 *unrecoverable_error_location_.get() : tracked_objects::Location(); | |
| 291 } | 290 } |
| 292 | 291 |
| 293 bool UIShouldDepictAuthInProgress() const { | 292 bool UIShouldDepictAuthInProgress() const { |
| 294 return is_auth_in_progress_; | 293 return is_auth_in_progress_; |
| 295 } | 294 } |
| 296 | 295 |
| 297 // Returns true if OnPassphraseRequired has been called for any reason. | 296 // Returns true if OnPassphraseRequired has been called for any reason. |
| 298 bool IsPassphraseRequired() const { | 297 bool IsPassphraseRequired() const { |
| 299 return passphrase_required_reason_ != | 298 return passphrase_required_reason_ != |
| 300 sync_api::REASON_PASSPHRASE_NOT_REQUIRED; | 299 sync_api::REASON_PASSPHRASE_NOT_REQUIRED; |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 // Encapsulates user signin with TokenService. | 600 // Encapsulates user signin with TokenService. |
| 602 scoped_ptr<SigninManager> signin_; | 601 scoped_ptr<SigninManager> signin_; |
| 603 | 602 |
| 604 // True if an unrecoverable error (e.g. violation of an assumed invariant) | 603 // True if an unrecoverable error (e.g. violation of an assumed invariant) |
| 605 // occurred during syncer operation. This value should be checked before | 604 // occurred during syncer operation. This value should be checked before |
| 606 // doing any work that might corrupt things further. | 605 // doing any work that might corrupt things further. |
| 607 bool unrecoverable_error_detected_; | 606 bool unrecoverable_error_detected_; |
| 608 | 607 |
| 609 // A message sent when an unrecoverable error occurred. | 608 // A message sent when an unrecoverable error occurred. |
| 610 std::string unrecoverable_error_message_; | 609 std::string unrecoverable_error_message_; |
| 611 scoped_ptr<tracked_objects::Location> unrecoverable_error_location_; | 610 tracked_objects::Location unrecoverable_error_location_; |
| 612 | 611 |
| 613 // Manages the start and stop of the various data types. | 612 // Manages the start and stop of the various data types. |
| 614 scoped_ptr<browser_sync::DataTypeManager> data_type_manager_; | 613 scoped_ptr<browser_sync::DataTypeManager> data_type_manager_; |
| 615 | 614 |
| 616 ObserverList<Observer> observers_; | 615 ObserverList<Observer> observers_; |
| 617 | 616 |
| 618 browser_sync::SyncJsController sync_js_controller_; | 617 browser_sync::SyncJsController sync_js_controller_; |
| 619 | 618 |
| 620 NotificationRegistrar registrar_; | 619 NotificationRegistrar registrar_; |
| 621 | 620 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 // (OnEncryptionComplete) or the user cancels. | 660 // (OnEncryptionComplete) or the user cancels. |
| 662 syncable::ModelTypeSet pending_types_for_encryption_; | 661 syncable::ModelTypeSet pending_types_for_encryption_; |
| 663 bool set_backend_encrypted_types_; | 662 bool set_backend_encrypted_types_; |
| 664 | 663 |
| 665 scoped_ptr<browser_sync::BackendMigrator> migrator_; | 664 scoped_ptr<browser_sync::BackendMigrator> migrator_; |
| 666 | 665 |
| 667 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 666 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 668 }; | 667 }; |
| 669 | 668 |
| 670 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 669 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |