| 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 #include "components/browser_sync/browser/profile_sync_service.h" | 5 #include "components/browser_sync/browser/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 891 backend_mode_ = IDLE; | 891 backend_mode_ = IDLE; |
| 892 expect_sync_configuration_aborted_ = false; | 892 expect_sync_configuration_aborted_ = false; |
| 893 is_auth_in_progress_ = false; | 893 is_auth_in_progress_ = false; |
| 894 backend_initialized_ = false; | 894 backend_initialized_ = false; |
| 895 cached_passphrase_.clear(); | 895 cached_passphrase_.clear(); |
| 896 encryption_pending_ = false; | 896 encryption_pending_ = false; |
| 897 encrypt_everything_ = false; | 897 encrypt_everything_ = false; |
| 898 encrypted_types_ = syncer::SyncEncryptionHandler::SensitiveTypes(); | 898 encrypted_types_ = syncer::SyncEncryptionHandler::SensitiveTypes(); |
| 899 passphrase_required_reason_ = syncer::REASON_PASSPHRASE_NOT_REQUIRED; | 899 passphrase_required_reason_ = syncer::REASON_PASSPHRASE_NOT_REQUIRED; |
| 900 catch_up_configure_in_progress_ = false; | 900 catch_up_configure_in_progress_ = false; |
| 901 access_token_.clear(); |
| 901 request_access_token_retry_timer_.Stop(); | 902 request_access_token_retry_timer_.Stop(); |
| 902 // Revert to "no auth error". | 903 // Revert to "no auth error". |
| 903 if (last_auth_error_.state() != GoogleServiceAuthError::NONE) | 904 if (last_auth_error_.state() != GoogleServiceAuthError::NONE) |
| 904 UpdateAuthErrorState(GoogleServiceAuthError::AuthErrorNone()); | 905 UpdateAuthErrorState(GoogleServiceAuthError::AuthErrorNone()); |
| 905 | 906 |
| 906 NotifyObservers(); | 907 NotifyObservers(); |
| 907 | 908 |
| 908 // Mark this as a clean shutdown(without crash). | 909 // Mark this as a clean shutdown(without crash). |
| 909 sync_prefs_.SetCleanShutdown(true); | 910 sync_prefs_.SetCleanShutdown(true); |
| 910 } | 911 } |
| (...skipping 1810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2721 } | 2722 } |
| 2722 | 2723 |
| 2723 std::string ProfileSyncService::unrecoverable_error_message() const { | 2724 std::string ProfileSyncService::unrecoverable_error_message() const { |
| 2724 return unrecoverable_error_message_; | 2725 return unrecoverable_error_message_; |
| 2725 } | 2726 } |
| 2726 | 2727 |
| 2727 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 2728 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() |
| 2728 const { | 2729 const { |
| 2729 return unrecoverable_error_location_; | 2730 return unrecoverable_error_location_; |
| 2730 } | 2731 } |
| OLD | NEW |