| 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/extensions/app_notification_manager.h" | 7 #include "chrome/browser/extensions/app_notification_manager.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/extensions/extension_system.h" | 9 #include "chrome/browser/extensions/extension_system.h" |
| 10 #include "chrome/browser/extensions/extension_system_factory.h" | 10 #include "chrome/browser/extensions/extension_system_factory.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 using browser_sync::TypedUrlModelAssociator; | 80 using browser_sync::TypedUrlModelAssociator; |
| 81 using browser_sync::UIDataTypeController; | 81 using browser_sync::UIDataTypeController; |
| 82 using browser_sync::DataTypeErrorHandler; | 82 using browser_sync::DataTypeErrorHandler; |
| 83 using content::BrowserThread; | 83 using content::BrowserThread; |
| 84 | 84 |
| 85 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( | 85 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( |
| 86 Profile* profile, CommandLine* command_line) | 86 Profile* profile, CommandLine* command_line) |
| 87 : profile_(profile), | 87 : profile_(profile), |
| 88 command_line_(command_line), | 88 command_line_(command_line), |
| 89 extension_system_( | 89 extension_system_( |
| 90 ExtensionSystemFactory::GetForProfile(profile)) { | 90 ExtensionSystem::Get(profile)) { |
| 91 } | 91 } |
| 92 | 92 |
| 93 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( | 93 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( |
| 94 ProfileSyncService* pss) { | 94 ProfileSyncService* pss) { |
| 95 // App sync is enabled by default. Register unless explicitly | 95 // App sync is enabled by default. Register unless explicitly |
| 96 // disabled. | 96 // disabled. |
| 97 if (!command_line_->HasSwitch(switches::kDisableSyncApps)) { | 97 if (!command_line_->HasSwitch(switches::kDisableSyncApps)) { |
| 98 pss->RegisterDataTypeController( | 98 pss->RegisterDataTypeController( |
| 99 new ExtensionDataTypeController(syncable::APPS, this, profile_, pss)); | 99 new ExtensionDataTypeController(syncable::APPS, this, profile_, pss)); |
| 100 } | 100 } |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 ProfileSyncComponentsFactory::SyncComponents | 332 ProfileSyncComponentsFactory::SyncComponents |
| 333 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 333 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 334 ProfileSyncService* profile_sync_service, | 334 ProfileSyncService* profile_sync_service, |
| 335 DataTypeErrorHandler* error_handler) { | 335 DataTypeErrorHandler* error_handler) { |
| 336 SessionModelAssociator* model_associator = | 336 SessionModelAssociator* model_associator = |
| 337 new SessionModelAssociator(profile_sync_service); | 337 new SessionModelAssociator(profile_sync_service); |
| 338 SessionChangeProcessor* change_processor = | 338 SessionChangeProcessor* change_processor = |
| 339 new SessionChangeProcessor(error_handler, model_associator); | 339 new SessionChangeProcessor(error_handler, model_associator); |
| 340 return SyncComponents(model_associator, change_processor); | 340 return SyncComponents(model_associator, change_processor); |
| 341 } | 341 } |
| OLD | NEW |