| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 using sync_driver::SharedChangeProcessor; | 139 using sync_driver::SharedChangeProcessor; |
| 140 using sync_driver::UIDataTypeController; | 140 using sync_driver::UIDataTypeController; |
| 141 | 141 |
| 142 namespace { | 142 namespace { |
| 143 | 143 |
| 144 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( | 144 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( |
| 145 const base::CommandLine& command_line) { | 145 const base::CommandLine& command_line) { |
| 146 syncer::ModelTypeSet disabled_types; | 146 syncer::ModelTypeSet disabled_types; |
| 147 std::string disabled_types_str = | 147 std::string disabled_types_str = |
| 148 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); | 148 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); |
| 149 |
| 150 std::string disable_types_finch = |
| 151 variations::GetVariationParamValue("LightSpeed", "DisableSyncPart"); |
| 152 if (!disable_types_finch.empty()) { |
| 153 if (disabled_types_str.empty()) |
| 154 disabled_types_str = disable_types_finch; |
| 155 else |
| 156 disabled_types_str += ", " + disable_types_finch; |
| 157 } |
| 158 |
| 149 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); | 159 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); |
| 150 return disabled_types; | 160 return disabled_types; |
| 151 } | 161 } |
| 152 | 162 |
| 153 syncer::ModelTypeSet GetEnabledTypesFromCommandLine( | 163 syncer::ModelTypeSet GetEnabledTypesFromCommandLine( |
| 154 const base::CommandLine& command_line) { | 164 const base::CommandLine& command_line) { |
| 155 syncer::ModelTypeSet enabled_types; | 165 syncer::ModelTypeSet enabled_types; |
| 156 return enabled_types; | 166 return enabled_types; |
| 157 } | 167 } |
| 158 | 168 |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 new TypedUrlModelAssociator(profile_sync_service, | 729 new TypedUrlModelAssociator(profile_sync_service, |
| 720 history_backend, | 730 history_backend, |
| 721 error_handler); | 731 error_handler); |
| 722 TypedUrlChangeProcessor* change_processor = | 732 TypedUrlChangeProcessor* change_processor = |
| 723 new TypedUrlChangeProcessor(profile_, | 733 new TypedUrlChangeProcessor(profile_, |
| 724 model_associator, | 734 model_associator, |
| 725 history_backend, | 735 history_backend, |
| 726 error_handler); | 736 error_handler); |
| 727 return SyncComponents(model_associator, change_processor); | 737 return SyncComponents(model_associator, change_processor); |
| 728 } | 738 } |
| OLD | NEW |