| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 #if !defined(OS_ANDROID) | 186 #if !defined(OS_ANDROID) |
| 187 RegisterDesktopDataTypes(disabled_types, enabled_types, pss); | 187 RegisterDesktopDataTypes(disabled_types, enabled_types, pss); |
| 188 #endif | 188 #endif |
| 189 } | 189 } |
| 190 | 190 |
| 191 void ProfileSyncComponentsFactoryImpl::DisableBrokenType( | 191 void ProfileSyncComponentsFactoryImpl::DisableBrokenType( |
| 192 syncer::ModelType type, | 192 syncer::ModelType type, |
| 193 const tracked_objects::Location& from_here, | 193 const tracked_objects::Location& from_here, |
| 194 const std::string& message) { | 194 const std::string& message) { |
| 195 ProfileSyncService* p = ProfileSyncServiceFactory::GetForProfile(profile_); | 195 ProfileSyncService* p = ProfileSyncServiceFactory::GetForProfile(profile_); |
| 196 p->DisableBrokenDatatype(type, from_here, message); | 196 p->DisableDatatype(type, from_here, message); |
| 197 } | 197 } |
| 198 | 198 |
| 199 DataTypeController::DisableTypeCallback | 199 DataTypeController::DisableTypeCallback |
| 200 ProfileSyncComponentsFactoryImpl::MakeDisableCallbackFor( | 200 ProfileSyncComponentsFactoryImpl::MakeDisableCallbackFor( |
| 201 syncer::ModelType type) { | 201 syncer::ModelType type) { |
| 202 return base::Bind(&ProfileSyncComponentsFactoryImpl::DisableBrokenType, | 202 return base::Bind(&ProfileSyncComponentsFactoryImpl::DisableBrokenType, |
| 203 weak_factory_.GetWeakPtr(), | 203 weak_factory_.GetWeakPtr(), |
| 204 type); | 204 type); |
| 205 } | 205 } |
| 206 | 206 |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 new TypedUrlModelAssociator(profile_sync_service, | 704 new TypedUrlModelAssociator(profile_sync_service, |
| 705 history_backend, | 705 history_backend, |
| 706 error_handler); | 706 error_handler); |
| 707 TypedUrlChangeProcessor* change_processor = | 707 TypedUrlChangeProcessor* change_processor = |
| 708 new TypedUrlChangeProcessor(profile_, | 708 new TypedUrlChangeProcessor(profile_, |
| 709 model_associator, | 709 model_associator, |
| 710 history_backend, | 710 history_backend, |
| 711 error_handler); | 711 error_handler); |
| 712 return SyncComponents(model_associator, change_processor); | 712 return SyncComponents(model_associator, change_processor); |
| 713 } | 713 } |
| OLD | NEW |