| 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/profiles/profile.h" | 6 #include "chrome/browser/profiles/profile.h" |
| 7 #include "chrome/browser/sync/glue/app_data_type_controller.h" | 7 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
| 8 #include "chrome/browser/sync/glue/autofill_change_processor.h" | 8 #include "chrome/browser/sync/glue/autofill_change_processor.h" |
| 9 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 9 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" |
| 10 #include "chrome/browser/sync/glue/autofill_model_associator.h" | 10 #include "chrome/browser/sync/glue/autofill_model_associator.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 | 109 |
| 110 // Extension sync is enabled by default. Register unless explicitly | 110 // Extension sync is enabled by default. Register unless explicitly |
| 111 // disabled. | 111 // disabled. |
| 112 if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) { | 112 if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) { |
| 113 pss->RegisterDataTypeController( | 113 pss->RegisterDataTypeController( |
| 114 new ExtensionDataTypeController(this, profile_, pss)); | 114 new ExtensionDataTypeController(this, profile_, pss)); |
| 115 } | 115 } |
| 116 | 116 |
| 117 // Password sync is disabled by default. Register only if | 117 // Password sync is disabled by default. Register only if |
| 118 // explicitly enabled. | 118 // explicitly enabled. |
| 119 if (command_line_->HasSwitch(switches::kEnableSyncPasswords)) { | 119 if (!command_line_->HasSwitch(switches::kDisableSyncPasswords)) { |
| 120 pss->RegisterDataTypeController( | 120 pss->RegisterDataTypeController( |
| 121 new PasswordDataTypeController(this, profile_, pss)); | 121 new PasswordDataTypeController(this, profile_, pss)); |
| 122 } | 122 } |
| 123 | 123 |
| 124 // Preference sync is enabled by default. Register unless explicitly | 124 // Preference sync is enabled by default. Register unless explicitly |
| 125 // disabled. | 125 // disabled. |
| 126 if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) { | 126 if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) { |
| 127 pss->RegisterDataTypeController( | 127 pss->RegisterDataTypeController( |
| 128 new PreferenceDataTypeController(this, pss)); | 128 new PreferenceDataTypeController(this, pss)); |
| 129 } | 129 } |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 ProfileSyncFactory::SyncComponents | 296 ProfileSyncFactory::SyncComponents |
| 297 ProfileSyncFactoryImpl::CreateSessionSyncComponents( | 297 ProfileSyncFactoryImpl::CreateSessionSyncComponents( |
| 298 ProfileSyncService* profile_sync_service, | 298 ProfileSyncService* profile_sync_service, |
| 299 UnrecoverableErrorHandler* error_handler) { | 299 UnrecoverableErrorHandler* error_handler) { |
| 300 SessionModelAssociator* model_associator = | 300 SessionModelAssociator* model_associator = |
| 301 new SessionModelAssociator(profile_sync_service); | 301 new SessionModelAssociator(profile_sync_service); |
| 302 SessionChangeProcessor* change_processor = | 302 SessionChangeProcessor* change_processor = |
| 303 new SessionChangeProcessor(error_handler, model_associator); | 303 new SessionChangeProcessor(error_handler, model_associator); |
| 304 return SyncComponents(model_associator, change_processor); | 304 return SyncComponents(model_associator, change_processor); |
| 305 } | 305 } |
| OLD | NEW |