| 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 "components/browser_sync/browser/profile_sync_components_factory_impl.h
" | 5 #include "components/browser_sync/browser/profile_sync_components_factory_impl.h
" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "google_apis/gaia/oauth2_token_service.h" | 47 #include "google_apis/gaia/oauth2_token_service.h" |
| 48 #include "google_apis/gaia/oauth2_token_service_request.h" | 48 #include "google_apis/gaia/oauth2_token_service_request.h" |
| 49 #include "net/url_request/url_request_context_getter.h" | 49 #include "net/url_request/url_request_context_getter.h" |
| 50 | 50 |
| 51 using bookmarks::BookmarkModel; | 51 using bookmarks::BookmarkModel; |
| 52 using browser_sync::AutofillDataTypeController; | 52 using browser_sync::AutofillDataTypeController; |
| 53 using browser_sync::AutofillProfileDataTypeController; | 53 using browser_sync::AutofillProfileDataTypeController; |
| 54 using browser_sync::ChromeReportUnrecoverableError; | 54 using browser_sync::ChromeReportUnrecoverableError; |
| 55 using browser_sync::HistoryDeleteDirectivesDataTypeController; | 55 using browser_sync::HistoryDeleteDirectivesDataTypeController; |
| 56 using browser_sync::PasswordDataTypeController; | 56 using browser_sync::PasswordDataTypeController; |
| 57 using browser_sync::SessionDataTypeController; | |
| 58 using browser_sync::SyncBackendHost; | 57 using browser_sync::SyncBackendHost; |
| 59 using browser_sync::TypedUrlDataTypeController; | 58 using browser_sync::TypedUrlDataTypeController; |
| 60 using sync_bookmarks::BookmarkChangeProcessor; | 59 using sync_bookmarks::BookmarkChangeProcessor; |
| 61 using sync_bookmarks::BookmarkDataTypeController; | 60 using sync_bookmarks::BookmarkDataTypeController; |
| 62 using sync_bookmarks::BookmarkModelAssociator; | 61 using sync_bookmarks::BookmarkModelAssociator; |
| 63 using sync_driver::DataTypeController; | 62 using sync_driver::DataTypeController; |
| 64 using sync_driver::DataTypeManager; | 63 using sync_driver::DataTypeManager; |
| 65 using sync_driver::DataTypeManagerImpl; | 64 using sync_driver::DataTypeManagerImpl; |
| 66 using sync_driver::DataTypeManagerObserver; | 65 using sync_driver::DataTypeManagerObserver; |
| 67 using sync_driver::DeviceInfoDataTypeController; | 66 using sync_driver::DeviceInfoDataTypeController; |
| 68 using sync_driver::ProxyDataTypeController; | 67 using sync_driver::ProxyDataTypeController; |
| 69 using sync_driver::UIDataTypeController; | 68 using sync_driver::UIDataTypeController; |
| 70 using sync_driver_v2::UIModelTypeController; | 69 using sync_driver_v2::UIModelTypeController; |
| 70 using sync_sessions::SessionDataTypeController; |
| 71 | 71 |
| 72 namespace { | 72 namespace { |
| 73 | 73 |
| 74 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( | 74 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( |
| 75 const base::CommandLine& command_line) { | 75 const base::CommandLine& command_line) { |
| 76 syncer::ModelTypeSet disabled_types; | 76 syncer::ModelTypeSet disabled_types; |
| 77 std::string disabled_types_str = | 77 std::string disabled_types_str = |
| 78 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); | 78 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); |
| 79 | 79 |
| 80 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); | 80 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 return SyncComponents(model_associator, change_processor); | 420 return SyncComponents(model_associator, change_processor); |
| 421 } | 421 } |
| 422 | 422 |
| 423 // static | 423 // static |
| 424 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) { | 424 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) { |
| 425 override_prefs_controller_to_uss_for_test_ = use_uss; | 425 override_prefs_controller_to_uss_for_test_ = use_uss; |
| 426 } | 426 } |
| 427 | 427 |
| 428 bool ProfileSyncComponentsFactoryImpl:: | 428 bool ProfileSyncComponentsFactoryImpl:: |
| 429 override_prefs_controller_to_uss_for_test_ = false; | 429 override_prefs_controller_to_uss_for_test_ = false; |
| OLD | NEW |