| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/sync/ios_chrome_sync_client.h" | 5 #include "ios/chrome/browser/sync/ios_chrome_sync_client.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 case syncer::PASSWORDS: { | 320 case syncer::PASSWORDS: { |
| 321 return password_store_ ? password_store_->GetPasswordSyncableService() | 321 return password_store_ ? password_store_->GetPasswordSyncableService() |
| 322 : base::WeakPtr<syncer::SyncableService>(); | 322 : base::WeakPtr<syncer::SyncableService>(); |
| 323 } | 323 } |
| 324 default: | 324 default: |
| 325 NOTREACHED(); | 325 NOTREACHED(); |
| 326 return base::WeakPtr<syncer::SyncableService>(); | 326 return base::WeakPtr<syncer::SyncableService>(); |
| 327 } | 327 } |
| 328 } | 328 } |
| 329 | 329 |
| 330 base::WeakPtr<syncer::ModelTypeService> | 330 base::WeakPtr<syncer::ModelTypeSyncBridge> |
| 331 IOSChromeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) { | 331 IOSChromeSyncClient::GetSyncBridgeForModelType(syncer::ModelType type) { |
| 332 switch (type) { | 332 switch (type) { |
| 333 case syncer::DEVICE_INFO: | 333 case syncer::DEVICE_INFO: |
| 334 return IOSChromeProfileSyncServiceFactory::GetForBrowserState( | 334 return IOSChromeProfileSyncServiceFactory::GetForBrowserState( |
| 335 browser_state_) | 335 browser_state_) |
| 336 ->GetDeviceInfoService() | 336 ->GetDeviceInfoService() |
| 337 ->AsWeakPtr(); | 337 ->AsWeakPtr(); |
| 338 default: | 338 default: |
| 339 NOTREACHED(); | 339 NOTREACHED(); |
| 340 return base::WeakPtr<syncer::ModelTypeService>(); | 340 return base::WeakPtr<syncer::ModelTypeSyncBridge>(); |
| 341 } | 341 } |
| 342 } | 342 } |
| 343 | 343 |
| 344 scoped_refptr<syncer::ModelSafeWorker> | 344 scoped_refptr<syncer::ModelSafeWorker> |
| 345 IOSChromeSyncClient::CreateModelWorkerForGroup( | 345 IOSChromeSyncClient::CreateModelWorkerForGroup( |
| 346 syncer::ModelSafeGroup group, | 346 syncer::ModelSafeGroup group, |
| 347 syncer::WorkerLoopDestructionObserver* observer) { | 347 syncer::WorkerLoopDestructionObserver* observer) { |
| 348 DCHECK_CURRENTLY_ON(web::WebThread::UI); | 348 DCHECK_CURRENTLY_ON(web::WebThread::UI); |
| 349 switch (group) { | 349 switch (group) { |
| 350 case syncer::GROUP_DB: | 350 case syncer::GROUP_DB: |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state); | 401 IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state); |
| 402 if (profile_sync_service != nullptr) { | 402 if (profile_sync_service != nullptr) { |
| 403 const syncer::DeviceInfoTracker* tracker = | 403 const syncer::DeviceInfoTracker* tracker = |
| 404 profile_sync_service->GetDeviceInfoTracker(); | 404 profile_sync_service->GetDeviceInfoTracker(); |
| 405 if (tracker != nullptr) { | 405 if (tracker != nullptr) { |
| 406 trackers->push_back(tracker); | 406 trackers->push_back(tracker); |
| 407 } | 407 } |
| 408 } | 408 } |
| 409 } | 409 } |
| 410 } | 410 } |
| OLD | NEW |