Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ | 5 #ifndef COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ |
| 6 #define COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ | 6 #define COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 // Our asynchronous backend to communicate with sync components living on | 626 // Our asynchronous backend to communicate with sync components living on |
| 627 // other threads. | 627 // other threads. |
| 628 std::unique_ptr<browser_sync::SyncBackendHost> backend_; | 628 std::unique_ptr<browser_sync::SyncBackendHost> backend_; |
| 629 | 629 |
| 630 // Was the last SYNC_PASSPHRASE_REQUIRED notification sent because it | 630 // Was the last SYNC_PASSPHRASE_REQUIRED notification sent because it |
| 631 // was required for encryption, decryption with a cached passphrase, or | 631 // was required for encryption, decryption with a cached passphrase, or |
| 632 // because a new passphrase is required? | 632 // because a new passphrase is required? |
| 633 syncer::PassphraseRequiredReason passphrase_required_reason_; | 633 syncer::PassphraseRequiredReason passphrase_required_reason_; |
| 634 | 634 |
| 635 private: | 635 private: |
| 636 friend class PermissionUmaUtilTest; | |
|
raymes
2016/06/22 02:11:13
nit: move this down to where the other "friend" de
stefanocs
2016/06/22 04:28:12
Done.
| |
| 637 | |
| 636 enum UnrecoverableErrorReason { | 638 enum UnrecoverableErrorReason { |
| 637 ERROR_REASON_UNSET, | 639 ERROR_REASON_UNSET, |
| 638 ERROR_REASON_SYNCER, | 640 ERROR_REASON_SYNCER, |
| 639 ERROR_REASON_BACKEND_INIT_FAILURE, | 641 ERROR_REASON_BACKEND_INIT_FAILURE, |
| 640 ERROR_REASON_CONFIGURATION_RETRY, | 642 ERROR_REASON_CONFIGURATION_RETRY, |
| 641 ERROR_REASON_CONFIGURATION_FAILURE, | 643 ERROR_REASON_CONFIGURATION_FAILURE, |
| 642 ERROR_REASON_ACTIONABLE_ERROR, | 644 ERROR_REASON_ACTIONABLE_ERROR, |
| 643 ERROR_REASON_LIMIT | 645 ERROR_REASON_LIMIT |
| 644 }; | 646 }; |
| 645 | 647 |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1020 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; | 1022 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; |
| 1021 | 1023 |
| 1022 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1024 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 1023 }; | 1025 }; |
| 1024 | 1026 |
| 1025 bool ShouldShowActionOnUI( | 1027 bool ShouldShowActionOnUI( |
| 1026 const syncer::SyncProtocolError& error); | 1028 const syncer::SyncProtocolError& error); |
| 1027 | 1029 |
| 1028 | 1030 |
| 1029 #endif // COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ | 1031 #endif // COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |