| 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 <vector> | 9 #include <vector> | 
| 10 | 10 | 
| (...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1120   sync_js_controller_.AttachJsBackend(js_backend); | 1120   sync_js_controller_.AttachJsBackend(js_backend); | 
| 1121   debug_info_listener_ = debug_info_listener; | 1121   debug_info_listener_ = debug_info_listener; | 
| 1122 | 1122 | 
| 1123   SigninClient* signin_client = | 1123   SigninClient* signin_client = | 
| 1124       ChromeSigninClientFactory::GetForProfile(profile_); | 1124       ChromeSigninClientFactory::GetForProfile(profile_); | 
| 1125   DCHECK(signin_client); | 1125   DCHECK(signin_client); | 
| 1126   std::string signin_scoped_device_id = | 1126   std::string signin_scoped_device_id = | 
| 1127       signin_client->GetSigninScopedDeviceId(); | 1127       signin_client->GetSigninScopedDeviceId(); | 
| 1128 | 1128 | 
| 1129   // Initialize local device info. | 1129   // Initialize local device info. | 
| 1130   local_device_->Initialize(cache_guid, signin_scoped_device_id); | 1130   local_device_->Initialize(cache_guid, signin_scoped_device_id, | 
|  | 1131                             content::BrowserThread::GetBlockingPool()); | 
| 1131 | 1132 | 
| 1132   if (backend_mode_ == BACKUP || backend_mode_ == ROLLBACK) | 1133   if (backend_mode_ == BACKUP || backend_mode_ == ROLLBACK) | 
| 1133     ConfigureDataTypeManager(); | 1134     ConfigureDataTypeManager(); | 
| 1134   else | 1135   else | 
| 1135     PostBackendInitialization(); | 1136     PostBackendInitialization(); | 
| 1136 } | 1137 } | 
| 1137 | 1138 | 
| 1138 void ProfileSyncService::OnSyncCycleCompleted() { | 1139 void ProfileSyncService::OnSyncCycleCompleted() { | 
| 1139   UpdateLastSyncedTime(); | 1140   UpdateLastSyncedTime(); | 
| 1140   if (IsDataTypeControllerRunning(syncer::SESSIONS)) { | 1141   if (IsDataTypeControllerRunning(syncer::SESSIONS)) { | 
| (...skipping 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2736 } | 2737 } | 
| 2737 | 2738 | 
| 2738 std::string ProfileSyncService::unrecoverable_error_message() const { | 2739 std::string ProfileSyncService::unrecoverable_error_message() const { | 
| 2739   return unrecoverable_error_message_; | 2740   return unrecoverable_error_message_; | 
| 2740 } | 2741 } | 
| 2741 | 2742 | 
| 2742 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 2743 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 
| 2743     const { | 2744     const { | 
| 2744   return unrecoverable_error_location_; | 2745   return unrecoverable_error_location_; | 
| 2745 } | 2746 } | 
| OLD | NEW | 
|---|