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

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

Issue 2463463004: [Sync] Rename wifi_sync to sync_wifi. (Closed)
Patch Set: 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "chrome/browser/spellchecker/spellcheck_service.h" 97 #include "chrome/browser/spellchecker/spellcheck_service.h"
98 #endif 98 #endif
99 99
100 #if BUILDFLAG(ANDROID_JAVA_UI) 100 #if BUILDFLAG(ANDROID_JAVA_UI)
101 #include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h" 101 #include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h"
102 #endif 102 #endif
103 103
104 #if defined(OS_CHROMEOS) 104 #if defined(OS_CHROMEOS)
105 #include "chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h " 105 #include "chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h "
106 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h" 106 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
107 #include "components/wifi_sync/wifi_credential_syncable_service.h" 107 #include "components/sync_wifi/wifi_credential_syncable_service.h"
108 #include "components/wifi_sync/wifi_credential_syncable_service_factory.h" 108 #include "components/sync_wifi/wifi_credential_syncable_service_factory.h"
109 #endif 109 #endif
110 110
111 using content::BrowserThread; 111 using content::BrowserThread;
112 #if defined(ENABLE_EXTENSIONS) 112 #if defined(ENABLE_EXTENSIONS)
113 using browser_sync::ExtensionDataTypeController; 113 using browser_sync::ExtensionDataTypeController;
114 using browser_sync::ExtensionSettingDataTypeController; 114 using browser_sync::ExtensionSettingDataTypeController;
115 #endif 115 #endif
116 using browser_sync::SearchEngineDataTypeController; 116 using browser_sync::SearchEngineDataTypeController;
117 using syncer::UIDataTypeController; 117 using syncer::UIDataTypeController;
118 118
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 return ProfileSyncServiceFactory::GetForProfile(profile_)-> 405 return ProfileSyncServiceFactory::GetForProfile(profile_)->
406 GetSessionsSyncableService()->AsWeakPtr(); 406 GetSessionsSyncableService()->AsWeakPtr();
407 } 407 }
408 case syncer::PASSWORDS: { 408 case syncer::PASSWORDS: {
409 return password_store_.get() 409 return password_store_.get()
410 ? password_store_->GetPasswordSyncableService() 410 ? password_store_->GetPasswordSyncableService()
411 : base::WeakPtr<syncer::SyncableService>(); 411 : base::WeakPtr<syncer::SyncableService>();
412 } 412 }
413 #if defined(OS_CHROMEOS) 413 #if defined(OS_CHROMEOS)
414 case syncer::WIFI_CREDENTIALS: 414 case syncer::WIFI_CREDENTIALS:
415 return wifi_sync::WifiCredentialSyncableServiceFactory:: 415 return sync_wifi::WifiCredentialSyncableServiceFactory::
416 GetForBrowserContext(profile_)->AsWeakPtr(); 416 GetForBrowserContext(profile_)
417 ->AsWeakPtr();
417 case syncer::ARC_PACKAGE: 418 case syncer::ARC_PACKAGE:
418 return arc::ArcPackageSyncableService::Get(profile_)->AsWeakPtr(); 419 return arc::ArcPackageSyncableService::Get(profile_)->AsWeakPtr();
419 #endif 420 #endif
420 default: 421 default:
421 // The following datatypes still need to be transitioned to the 422 // The following datatypes still need to be transitioned to the
422 // syncer::SyncableService API: 423 // syncer::SyncableService API:
423 // Bookmarks 424 // Bookmarks
424 NOTREACHED(); 425 NOTREACHED();
425 return base::WeakPtr<syncer::SyncableService>(); 426 return base::WeakPtr<syncer::SyncableService>();
426 } 427 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 sync_service->RegisterDataTypeController( 628 sync_service->RegisterDataTypeController(
628 base::MakeUnique<SupervisedUserSyncDataTypeController>( 629 base::MakeUnique<SupervisedUserSyncDataTypeController>(
629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 630 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
630 sync_service->RegisterDataTypeController( 631 sync_service->RegisterDataTypeController(
631 base::MakeUnique<SupervisedUserSyncDataTypeController>( 632 base::MakeUnique<SupervisedUserSyncDataTypeController>(
632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 633 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
633 #endif 634 #endif
634 } 635 }
635 636
636 } // namespace browser_sync 637 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/DEPS ('k') | chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698