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

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

Issue 2458013002: [Sync] Rename ModelTypeService to ModelTypeSyncBridge. (Closed)
Patch Set: s/SetBridgeError/ErrorOnNextCall Created 4 years, 1 month 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 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 "chrome/browser/sync/chrome_sync_client.h" 5 #include "chrome/browser/sync/chrome_sync_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 #endif 419 #endif
420 default: 420 default:
421 // The following datatypes still need to be transitioned to the 421 // The following datatypes still need to be transitioned to the
422 // syncer::SyncableService API: 422 // syncer::SyncableService API:
423 // Bookmarks 423 // Bookmarks
424 NOTREACHED(); 424 NOTREACHED();
425 return base::WeakPtr<syncer::SyncableService>(); 425 return base::WeakPtr<syncer::SyncableService>();
426 } 426 }
427 } 427 }
428 428
429 base::WeakPtr<syncer::ModelTypeService> 429 base::WeakPtr<syncer::ModelTypeSyncBridge>
430 ChromeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) { 430 ChromeSyncClient::GetSyncBridgeForModelType(syncer::ModelType type) {
431 switch (type) { 431 switch (type) {
432 case syncer::DEVICE_INFO: 432 case syncer::DEVICE_INFO:
433 return ProfileSyncServiceFactory::GetForProfile(profile_) 433 return ProfileSyncServiceFactory::GetForProfile(profile_)
434 ->GetDeviceInfoService() 434 ->GetDeviceInfoService()
435 ->AsWeakPtr(); 435 ->AsWeakPtr();
436 default: 436 default:
437 NOTREACHED(); 437 NOTREACHED();
438 return base::WeakPtr<syncer::ModelTypeService>(); 438 return base::WeakPtr<syncer::ModelTypeSyncBridge>();
439 } 439 }
440 } 440 }
441 441
442 scoped_refptr<syncer::ModelSafeWorker> 442 scoped_refptr<syncer::ModelSafeWorker>
443 ChromeSyncClient::CreateModelWorkerForGroup( 443 ChromeSyncClient::CreateModelWorkerForGroup(
444 syncer::ModelSafeGroup group, 444 syncer::ModelSafeGroup group,
445 syncer::WorkerLoopDestructionObserver* observer) { 445 syncer::WorkerLoopDestructionObserver* observer) {
446 DCHECK_CURRENTLY_ON(BrowserThread::UI); 446 DCHECK_CURRENTLY_ON(BrowserThread::UI);
447 switch (group) { 447 switch (group) {
448 case syncer::GROUP_DB: 448 case syncer::GROUP_DB:
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 sync_service->RegisterDataTypeController( 627 sync_service->RegisterDataTypeController(
628 base::MakeUnique<SupervisedUserSyncDataTypeController>( 628 base::MakeUnique<SupervisedUserSyncDataTypeController>(
629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
630 sync_service->RegisterDataTypeController( 630 sync_service->RegisterDataTypeController(
631 base::MakeUnique<SupervisedUserSyncDataTypeController>( 631 base::MakeUnique<SupervisedUserSyncDataTypeController>(
632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
633 #endif 633 #endif
634 } 634 }
635 635
636 } // namespace browser_sync 636 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.h ('k') | chrome/browser/sync/test/integration/two_client_uss_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698