| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/defaults.h" | 6 #include "chrome/browser/defaults.h" |
| 7 #include "chrome/browser/profile.h" | 7 #include "chrome/browser/profile.h" |
| 8 #include "chrome/browser/sync/glue/app_data_type_controller.h" | 8 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
| 9 #include "chrome/browser/sync/glue/autofill_change_processor.h" | 9 #include "chrome/browser/sync/glue/autofill_change_processor.h" |
| 10 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 10 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 104 |
| 105 // Extension sync is enabled by default. Register unless explicitly | 105 // Extension sync is enabled by default. Register unless explicitly |
| 106 // disabled. | 106 // disabled. |
| 107 if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) { | 107 if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) { |
| 108 pss->RegisterDataTypeController( | 108 pss->RegisterDataTypeController( |
| 109 new ExtensionDataTypeController(this, profile_, pss)); | 109 new ExtensionDataTypeController(this, profile_, pss)); |
| 110 } | 110 } |
| 111 | 111 |
| 112 // Password sync is disabled by default. Register only if | 112 // Password sync is disabled by default. Register only if |
| 113 // explicitly enabled. | 113 // explicitly enabled. |
| 114 if (command_line_->HasSwitch(switches::kEnableSyncPasswords)) { | 114 if (!command_line_->HasSwitch(switches::kDisableSyncPasswords)) { |
| 115 pss->RegisterDataTypeController( | 115 pss->RegisterDataTypeController( |
| 116 new PasswordDataTypeController(this, profile_, pss)); | 116 new PasswordDataTypeController(this, profile_, pss)); |
| 117 } | 117 } |
| 118 | 118 |
| 119 // Preference sync is enabled by default. Register unless explicitly | 119 // Preference sync is enabled by default. Register unless explicitly |
| 120 // disabled. | 120 // disabled. |
| 121 if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) { | 121 if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) { |
| 122 pss->RegisterDataTypeController( | 122 pss->RegisterDataTypeController( |
| 123 new PreferenceDataTypeController(this, pss)); | 123 new PreferenceDataTypeController(this, pss)); |
| 124 } | 124 } |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 ProfileSyncFactory::SyncComponents | 266 ProfileSyncFactory::SyncComponents |
| 267 ProfileSyncFactoryImpl::CreateSessionSyncComponents( | 267 ProfileSyncFactoryImpl::CreateSessionSyncComponents( |
| 268 ProfileSyncService* profile_sync_service, | 268 ProfileSyncService* profile_sync_service, |
| 269 UnrecoverableErrorHandler* error_handler) { | 269 UnrecoverableErrorHandler* error_handler) { |
| 270 SessionModelAssociator* model_associator = | 270 SessionModelAssociator* model_associator = |
| 271 new SessionModelAssociator(profile_sync_service); | 271 new SessionModelAssociator(profile_sync_service); |
| 272 SessionChangeProcessor* change_processor = | 272 SessionChangeProcessor* change_processor = |
| 273 new SessionChangeProcessor(error_handler, model_associator); | 273 new SessionChangeProcessor(error_handler, model_associator); |
| 274 return SyncComponents(model_associator, change_processor); | 274 return SyncComponents(model_associator, change_processor); |
| 275 } | 275 } |
| OLD | NEW |