| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 pss->RegisterDataTypeController( | 231 pss->RegisterDataTypeController( |
| 232 new SessionDataTypeController(this, | 232 new SessionDataTypeController(this, |
| 233 profile_, | 233 profile_, |
| 234 pss->GetSyncedWindowDelegatesGetter(), | 234 pss->GetSyncedWindowDelegatesGetter(), |
| 235 pss->GetLocalDeviceInfoProvider())); | 235 pss->GetLocalDeviceInfoProvider())); |
| 236 } | 236 } |
| 237 | 237 |
| 238 // Favicon sync is enabled by default. Register unless explicitly disabled. | 238 // Favicon sync is enabled by default. Register unless explicitly disabled. |
| 239 if (!disabled_types.Has(syncer::FAVICON_IMAGES) && | 239 if (!disabled_types.Has(syncer::FAVICON_IMAGES) && |
| 240 !disabled_types.Has(syncer::FAVICON_TRACKING)) { | 240 !disabled_types.Has(syncer::FAVICON_TRACKING)) { |
| 241 // crbug/384552. We disable error uploading for this data types for now. |
| 241 pss->RegisterDataTypeController( | 242 pss->RegisterDataTypeController( |
| 242 new UIDataTypeController( | 243 new UIDataTypeController( |
| 243 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 244 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
| 244 base::Bind(&ChromeReportUnrecoverableError), | 245 base::Closure(), |
| 245 syncer::FAVICON_IMAGES, | 246 syncer::FAVICON_IMAGES, |
| 246 this)); | 247 this)); |
| 247 pss->RegisterDataTypeController( | 248 pss->RegisterDataTypeController( |
| 248 new UIDataTypeController( | 249 new UIDataTypeController( |
| 249 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 250 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
| 250 base::Bind(&ChromeReportUnrecoverableError), | 251 base::Closure(), |
| 251 syncer::FAVICON_TRACKING, | 252 syncer::FAVICON_TRACKING, |
| 252 this)); | 253 this)); |
| 253 } | 254 } |
| 254 | 255 |
| 255 // Password sync is enabled by default. Register unless explicitly | 256 // Password sync is enabled by default. Register unless explicitly |
| 256 // disabled. | 257 // disabled. |
| 257 if (!disabled_types.Has(syncer::PASSWORDS)) { | 258 if (!disabled_types.Has(syncer::PASSWORDS)) { |
| 258 pss->RegisterDataTypeController( | 259 pss->RegisterDataTypeController( |
| 259 new PasswordDataTypeController(this, profile_)); | 260 new PasswordDataTypeController(this, profile_)); |
| 260 } | 261 } |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 new TypedUrlModelAssociator(profile_sync_service, | 674 new TypedUrlModelAssociator(profile_sync_service, |
| 674 history_backend, | 675 history_backend, |
| 675 error_handler); | 676 error_handler); |
| 676 TypedUrlChangeProcessor* change_processor = | 677 TypedUrlChangeProcessor* change_processor = |
| 677 new TypedUrlChangeProcessor(profile_, | 678 new TypedUrlChangeProcessor(profile_, |
| 678 model_associator, | 679 model_associator, |
| 679 history_backend, | 680 history_backend, |
| 680 error_handler); | 681 error_handler); |
| 681 return SyncComponents(model_associator, change_processor); | 682 return SyncComponents(model_associator, change_processor); |
| 682 } | 683 } |
| OLD | NEW |