Index: chrome/browser/sync/profile_sync_components_factory_impl.cc |
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
index c4b87d9967ae1c1b68c3e5f1e002b9fa92fe988c..2b055251c7f64d43cfb682d24a5140de4e1379c1 100644 |
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
@@ -59,6 +59,8 @@ |
#include "components/sync_driver/proxy_data_type_controller.h" |
#include "components/sync_driver/shared_change_processor.h" |
#include "components/sync_driver/ui_data_type_controller.h" |
+#include "components/wifi_sync/wifi_credential_syncable_service.h" |
+#include "components/wifi_sync/wifi_credential_syncable_service_factory.h" |
#include "content/public/browser/browser_thread.h" |
#include "google_apis/gaia/oauth2_token_service_request.h" |
#include "net/url_request/url_request_context_getter.h" |
@@ -417,6 +419,18 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
this, |
profile_)); |
#endif |
+ |
+#if defined(OS_CHROMEOS) |
mukesh agrawal
2014/12/03 01:44:43
This change is to prevent UI for WiFi sync from ap
|
+ if (command_line_->HasSwitch(switches::kEnableWifiCredentialSync) && |
+ !disabled_types.Has(syncer::WIFI_CREDENTIALS)) { |
+ pss->RegisterDataTypeController( |
+ new UIDataTypeController( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
+ base::Bind(&ChromeReportUnrecoverableError), |
+ syncer::WIFI_CREDENTIALS, |
+ this)); |
+ } |
+#endif |
} |
DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
@@ -562,6 +576,11 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl:: |
return base::WeakPtr<syncer::SyncableService>(); |
#endif |
} |
+#if defined(OS_CHROMEOS) |
+ case syncer::WIFI_CREDENTIALS: |
+ return wifi_sync::WifiCredentialSyncableServiceFactory:: |
+ GetForBrowserContext(profile_)->AsWeakPtr(); |
+#endif |
default: |
// The following datatypes still need to be transitioned to the |
// syncer::SyncableService API: |