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 "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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 #include "components/sync/base/report_unrecoverable_error.h" | 57 #include "components/sync/base/report_unrecoverable_error.h" |
58 #include "components/sync/driver/glue/browser_thread_model_worker.h" | 58 #include "components/sync/driver/glue/browser_thread_model_worker.h" |
59 #include "components/sync/driver/glue/ui_model_worker.h" | 59 #include "components/sync/driver/glue/ui_model_worker.h" |
60 #include "components/sync/driver/sync_api_component_factory.h" | 60 #include "components/sync/driver/sync_api_component_factory.h" |
61 #include "components/sync/driver/sync_util.h" | 61 #include "components/sync/driver/sync_util.h" |
62 #include "components/sync/driver/ui_data_type_controller.h" | 62 #include "components/sync/driver/ui_data_type_controller.h" |
63 #include "components/sync/engine/passive_model_worker.h" | 63 #include "components/sync/engine/passive_model_worker.h" |
64 #include "components/sync_preferences/pref_service_syncable.h" | 64 #include "components/sync_preferences/pref_service_syncable.h" |
65 #include "components/sync_sessions/sync_sessions_client.h" | 65 #include "components/sync_sessions/sync_sessions_client.h" |
66 #include "content/public/browser/browser_thread.h" | 66 #include "content/public/browser/browser_thread.h" |
| 67 #include "extensions/features/features.h" |
67 #include "ui/base/device_form_factor.h" | 68 #include "ui/base/device_form_factor.h" |
68 | 69 |
69 #if BUILDFLAG(ENABLE_APP_LIST) | 70 #if BUILDFLAG(ENABLE_APP_LIST) |
70 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 71 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
71 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" | 72 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
72 #include "ui/app_list/app_list_switches.h" | 73 #include "ui/app_list/app_list_switches.h" |
73 #endif | 74 #endif |
74 | 75 |
75 #if defined(ENABLE_EXTENSIONS) | 76 #if BUILDFLAG(ENABLE_EXTENSIONS) |
76 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" | 77 #include "chrome/browser/extensions/api/storage/settings_sync_util.h" |
77 #include "chrome/browser/extensions/extension_sync_service.h" | 78 #include "chrome/browser/extensions/extension_sync_service.h" |
78 #include "chrome/browser/sync/glue/extension_data_type_controller.h" | 79 #include "chrome/browser/sync/glue/extension_data_type_controller.h" |
79 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" | 80 #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" |
80 #endif | 81 #endif |
81 | 82 |
82 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) | 83 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
83 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 84 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
84 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service_factory.h" | 85 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service_factory.h" |
85 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" | 86 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" |
(...skipping 16 matching lines...) Expand all Loading... |
102 #endif | 103 #endif |
103 | 104 |
104 #if defined(OS_CHROMEOS) | 105 #if defined(OS_CHROMEOS) |
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_sync_data_type_controller.h
" |
106 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h" | 107 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h" |
107 #include "components/sync_wifi/wifi_credential_syncable_service.h" | 108 #include "components/sync_wifi/wifi_credential_syncable_service.h" |
108 #include "components/sync_wifi/wifi_credential_syncable_service_factory.h" | 109 #include "components/sync_wifi/wifi_credential_syncable_service_factory.h" |
109 #endif | 110 #endif |
110 | 111 |
111 using content::BrowserThread; | 112 using content::BrowserThread; |
112 #if defined(ENABLE_EXTENSIONS) | 113 #if BUILDFLAG(ENABLE_EXTENSIONS) |
113 using browser_sync::ExtensionDataTypeController; | 114 using browser_sync::ExtensionDataTypeController; |
114 using browser_sync::ExtensionSettingDataTypeController; | 115 using browser_sync::ExtensionSettingDataTypeController; |
115 #endif | 116 #endif |
116 using browser_sync::SearchEngineDataTypeController; | 117 using browser_sync::SearchEngineDataTypeController; |
117 using syncer::UIDataTypeController; | 118 using syncer::UIDataTypeController; |
118 | 119 |
119 namespace browser_sync { | 120 namespace browser_sync { |
120 | 121 |
121 // Chrome implementation of SyncSessionsClient. Needs to be in a separate class | 122 // Chrome implementation of SyncSessionsClient. Needs to be in a separate class |
122 // due to possible multiple inheritance issues, wherein ChromeSyncClient might | 123 // due to possible multiple inheritance issues, wherein ChromeSyncClient might |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 web_data_service_.get())->AsWeakPtr(); | 323 web_data_service_.get())->AsWeakPtr(); |
323 } else if (type == syncer::AUTOFILL_WALLET_METADATA) { | 324 } else if (type == syncer::AUTOFILL_WALLET_METADATA) { |
324 return autofill::AutofillWalletMetadataSyncableService:: | 325 return autofill::AutofillWalletMetadataSyncableService:: |
325 FromWebDataService(web_data_service_.get())->AsWeakPtr(); | 326 FromWebDataService(web_data_service_.get())->AsWeakPtr(); |
326 } | 327 } |
327 return autofill::AutofillWalletSyncableService::FromWebDataService( | 328 return autofill::AutofillWalletSyncableService::FromWebDataService( |
328 web_data_service_.get())->AsWeakPtr(); | 329 web_data_service_.get())->AsWeakPtr(); |
329 } | 330 } |
330 case syncer::SEARCH_ENGINES: | 331 case syncer::SEARCH_ENGINES: |
331 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); | 332 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); |
332 #if defined(ENABLE_EXTENSIONS) | 333 #if BUILDFLAG(ENABLE_EXTENSIONS) |
333 case syncer::APPS: | 334 case syncer::APPS: |
334 case syncer::EXTENSIONS: | 335 case syncer::EXTENSIONS: |
335 return ExtensionSyncService::Get(profile_)->AsWeakPtr(); | 336 return ExtensionSyncService::Get(profile_)->AsWeakPtr(); |
336 case syncer::APP_SETTINGS: | 337 case syncer::APP_SETTINGS: |
337 case syncer::EXTENSION_SETTINGS: | 338 case syncer::EXTENSION_SETTINGS: |
338 return extensions::settings_sync_util::GetSyncableService(profile_, type) | 339 return extensions::settings_sync_util::GetSyncableService(profile_, type) |
339 ->AsWeakPtr(); | 340 ->AsWeakPtr(); |
340 #endif | 341 #endif |
341 #if BUILDFLAG(ENABLE_APP_LIST) | 342 #if BUILDFLAG(ENABLE_APP_LIST) |
342 case syncer::APP_LIST: | 343 case syncer::APP_LIST: |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 } | 508 } |
508 } | 509 } |
509 | 510 |
510 void ChromeSyncClient::RegisterDesktopDataTypes( | 511 void ChromeSyncClient::RegisterDesktopDataTypes( |
511 syncer::SyncService* sync_service, | 512 syncer::SyncService* sync_service, |
512 syncer::ModelTypeSet disabled_types, | 513 syncer::ModelTypeSet disabled_types, |
513 syncer::ModelTypeSet enabled_types) { | 514 syncer::ModelTypeSet enabled_types) { |
514 base::Closure error_callback = | 515 base::Closure error_callback = |
515 base::Bind(&syncer::ReportUnrecoverableError, chrome::GetChannel()); | 516 base::Bind(&syncer::ReportUnrecoverableError, chrome::GetChannel()); |
516 | 517 |
517 #if defined(ENABLE_EXTENSIONS) | 518 #if BUILDFLAG(ENABLE_EXTENSIONS) |
518 // App sync is enabled by default. Register unless explicitly | 519 // App sync is enabled by default. Register unless explicitly |
519 // disabled. | 520 // disabled. |
520 if (!disabled_types.Has(syncer::APPS)) { | 521 if (!disabled_types.Has(syncer::APPS)) { |
521 sync_service->RegisterDataTypeController( | 522 sync_service->RegisterDataTypeController( |
522 base::MakeUnique<ExtensionDataTypeController>( | 523 base::MakeUnique<ExtensionDataTypeController>( |
523 syncer::APPS, error_callback, this, profile_)); | 524 syncer::APPS, error_callback, this, profile_)); |
524 } | 525 } |
525 | 526 |
526 // Extension sync is enabled by default. Register unless explicitly | 527 // Extension sync is enabled by default. Register unless explicitly |
527 // disabled. | 528 // disabled. |
(...skipping 15 matching lines...) Expand all Loading... |
543 | 544 |
544 // Search Engine sync is enabled by default. Register unless explicitly | 545 // Search Engine sync is enabled by default. Register unless explicitly |
545 // disabled. | 546 // disabled. |
546 if (!disabled_types.Has(syncer::SEARCH_ENGINES)) { | 547 if (!disabled_types.Has(syncer::SEARCH_ENGINES)) { |
547 sync_service->RegisterDataTypeController( | 548 sync_service->RegisterDataTypeController( |
548 base::MakeUnique<SearchEngineDataTypeController>( | 549 base::MakeUnique<SearchEngineDataTypeController>( |
549 error_callback, this, | 550 error_callback, this, |
550 TemplateURLServiceFactory::GetForProfile(profile_))); | 551 TemplateURLServiceFactory::GetForProfile(profile_))); |
551 } | 552 } |
552 | 553 |
553 #if defined(ENABLE_EXTENSIONS) | 554 #if BUILDFLAG(ENABLE_EXTENSIONS) |
554 // Extension setting sync is enabled by default. Register unless explicitly | 555 // Extension setting sync is enabled by default. Register unless explicitly |
555 // disabled. | 556 // disabled. |
556 if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) { | 557 if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) { |
557 sync_service->RegisterDataTypeController( | 558 sync_service->RegisterDataTypeController( |
558 base::MakeUnique<ExtensionSettingDataTypeController>( | 559 base::MakeUnique<ExtensionSettingDataTypeController>( |
559 syncer::EXTENSION_SETTINGS, error_callback, this, profile_)); | 560 syncer::EXTENSION_SETTINGS, error_callback, this, profile_)); |
560 } | 561 } |
561 | 562 |
562 // App setting sync is enabled by default. Register unless explicitly | 563 // App setting sync is enabled by default. Register unless explicitly |
563 // disabled. | 564 // disabled. |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 sync_service->RegisterDataTypeController( | 627 sync_service->RegisterDataTypeController( |
627 base::MakeUnique<SupervisedUserSyncDataTypeController>( | 628 base::MakeUnique<SupervisedUserSyncDataTypeController>( |
628 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); | 629 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); |
629 sync_service->RegisterDataTypeController( | 630 sync_service->RegisterDataTypeController( |
630 base::MakeUnique<SupervisedUserSyncDataTypeController>( | 631 base::MakeUnique<SupervisedUserSyncDataTypeController>( |
631 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); | 632 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); |
632 #endif | 633 #endif |
633 } | 634 } |
634 | 635 |
635 } // namespace browser_sync | 636 } // namespace browser_sync |
OLD | NEW |