Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 1397913002: [Sync] Componentize local_device_info_provider_impl and test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 sync_js_controller_.AttachJsBackend(js_backend); 1130 sync_js_controller_.AttachJsBackend(js_backend);
1131 debug_info_listener_ = debug_info_listener; 1131 debug_info_listener_ = debug_info_listener;
1132 1132
1133 SigninClient* signin_client = 1133 SigninClient* signin_client =
1134 ChromeSigninClientFactory::GetForProfile(profile_); 1134 ChromeSigninClientFactory::GetForProfile(profile_);
1135 DCHECK(signin_client); 1135 DCHECK(signin_client);
1136 std::string signin_scoped_device_id = 1136 std::string signin_scoped_device_id =
1137 signin_client->GetSigninScopedDeviceId(); 1137 signin_client->GetSigninScopedDeviceId();
1138 1138
1139 // Initialize local device info. 1139 // Initialize local device info.
1140 local_device_->Initialize(cache_guid, signin_scoped_device_id); 1140 local_device_->Initialize(cache_guid, signin_scoped_device_id,
1141 content::BrowserThread::GetBlockingPool());
1141 1142
1142 if (backend_mode_ == BACKUP || backend_mode_ == ROLLBACK) 1143 if (backend_mode_ == BACKUP || backend_mode_ == ROLLBACK)
1143 ConfigureDataTypeManager(); 1144 ConfigureDataTypeManager();
1144 else 1145 else
1145 PostBackendInitialization(); 1146 PostBackendInitialization();
1146 } 1147 }
1147 1148
1148 void ProfileSyncService::OnSyncCycleCompleted() { 1149 void ProfileSyncService::OnSyncCycleCompleted() {
1149 UpdateLastSyncedTime(); 1150 UpdateLastSyncedTime();
1150 if (IsDataTypeControllerRunning(syncer::SESSIONS)) { 1151 if (IsDataTypeControllerRunning(syncer::SESSIONS)) {
(...skipping 1580 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 } 2732 }
2732 2733
2733 std::string ProfileSyncService::unrecoverable_error_message() const { 2734 std::string ProfileSyncService::unrecoverable_error_message() const {
2734 return unrecoverable_error_message_; 2735 return unrecoverable_error_message_;
2735 } 2736 }
2736 2737
2737 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() 2738 tracked_objects::Location ProfileSyncService::unrecoverable_error_location()
2738 const { 2739 const {
2739 return unrecoverable_error_location_; 2740 return unrecoverable_error_location_;
2740 } 2741 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698