| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <cstddef> | 8 #include <cstddef> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 void ProfileSyncService::OnExperimentsChanged( | 1017 void ProfileSyncService::OnExperimentsChanged( |
| 1018 const syncer::Experiments& experiments) { | 1018 const syncer::Experiments& experiments) { |
| 1019 if (current_experiments_.Matches(experiments)) | 1019 if (current_experiments_.Matches(experiments)) |
| 1020 return; | 1020 return; |
| 1021 | 1021 |
| 1022 current_experiments_ = experiments; | 1022 current_experiments_ = experiments; |
| 1023 | 1023 |
| 1024 sync_client_->GetPrefService()->SetBoolean( | 1024 sync_client_->GetPrefService()->SetBoolean( |
| 1025 invalidation::prefs::kInvalidationServiceUseGCMChannel, | 1025 invalidation::prefs::kInvalidationServiceUseGCMChannel, |
| 1026 experiments.gcm_invalidations_enabled); | 1026 experiments.gcm_invalidations_enabled); |
| 1027 sync_client_->GetPrefService()->SetBoolean( | |
| 1028 autofill::prefs::kAutofillWalletSyncExperimentEnabled, | |
| 1029 experiments.wallet_sync_enabled); | |
| 1030 } | 1027 } |
| 1031 | 1028 |
| 1032 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { | 1029 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) { |
| 1033 is_auth_in_progress_ = false; | 1030 is_auth_in_progress_ = false; |
| 1034 last_auth_error_ = error; | 1031 last_auth_error_ = error; |
| 1035 | 1032 |
| 1036 NotifyObservers(); | 1033 NotifyObservers(); |
| 1037 } | 1034 } |
| 1038 | 1035 |
| 1039 namespace { | 1036 namespace { |
| (...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2459 } | 2456 } |
| 2460 | 2457 |
| 2461 std::string ProfileSyncService::unrecoverable_error_message() const { | 2458 std::string ProfileSyncService::unrecoverable_error_message() const { |
| 2462 return unrecoverable_error_message_; | 2459 return unrecoverable_error_message_; |
| 2463 } | 2460 } |
| 2464 | 2461 |
| 2465 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 2462 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() |
| 2466 const { | 2463 const { |
| 2467 return unrecoverable_error_location_; | 2464 return unrecoverable_error_location_; |
| 2468 } | 2465 } |
| OLD | NEW |