| 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 "chrome/browser/sync/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 ProfileSyncService::ProfileSyncService(ProfileSyncComponentsFactory* factory, | 131 ProfileSyncService::ProfileSyncService(ProfileSyncComponentsFactory* factory, |
| 132 Profile* profile, | 132 Profile* profile, |
| 133 SigninManager* signin_manager, | 133 SigninManager* signin_manager, |
| 134 StartBehavior start_behavior) | 134 StartBehavior start_behavior) |
| 135 : last_auth_error_(AuthError::None()), | 135 : last_auth_error_(AuthError::None()), |
| 136 passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED), | 136 passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED), |
| 137 factory_(factory), | 137 factory_(factory), |
| 138 profile_(profile), | 138 profile_(profile), |
| 139 // |profile| may be NULL in unit tests. | 139 // |profile| may be NULL in unit tests. |
| 140 sync_prefs_(profile_ ? profile_->GetPrefs() : NULL), | 140 sync_prefs_(profile_ ? profile_->GetPrefs() : NULL), |
| 141 invalidator_storage_( | 141 invalidator_storage_(profile_ ? profile_->GetPrefs(): NULL), |
| 142 profile_ ? profile_->GetPrefs(): NULL, | |
| 143 profile_ ? static_cast<PrefRegistrySyncable*>( | |
| 144 profile_->GetPrefs()->DeprecatedGetPrefRegistry()) : NULL), | |
| 145 sync_service_url_(kDevServerUrl), | 142 sync_service_url_(kDevServerUrl), |
| 146 is_first_time_sync_configure_(false), | 143 is_first_time_sync_configure_(false), |
| 147 backend_initialized_(false), | 144 backend_initialized_(false), |
| 148 is_auth_in_progress_(false), | 145 is_auth_in_progress_(false), |
| 149 signin_(signin_manager), | 146 signin_(signin_manager), |
| 150 unrecoverable_error_reason_(ERROR_REASON_UNSET), | 147 unrecoverable_error_reason_(ERROR_REASON_UNSET), |
| 151 weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 148 weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
| 152 expect_sync_configuration_aborted_(false), | 149 expect_sync_configuration_aborted_(false), |
| 153 encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()), | 150 encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()), |
| 154 encrypt_everything_(false), | 151 encrypt_everything_(false), |
| (...skipping 1822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1977 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. | 1974 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine
d-behaviour-after-directly-calling-the-destru. |
| 1978 ProfileSyncService* old_this = this; | 1975 ProfileSyncService* old_this = this; |
| 1979 this->~ProfileSyncService(); | 1976 this->~ProfileSyncService(); |
| 1980 new(old_this) ProfileSyncService( | 1977 new(old_this) ProfileSyncService( |
| 1981 new ProfileSyncComponentsFactoryImpl(profile, | 1978 new ProfileSyncComponentsFactoryImpl(profile, |
| 1982 CommandLine::ForCurrentProcess()), | 1979 CommandLine::ForCurrentProcess()), |
| 1983 profile, | 1980 profile, |
| 1984 signin, | 1981 signin, |
| 1985 behavior); | 1982 behavior); |
| 1986 } | 1983 } |
| OLD | NEW |