| 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 "chrome/browser/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2008 kOsWin | kOsMac | kOsLinux | kOsAndroid, | 2008 kOsWin | kOsMac | kOsLinux | kOsAndroid, |
| 2009 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, | 2009 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, |
| 2010 #if defined(OS_CHROMEOS) | 2010 #if defined(OS_CHROMEOS) |
| 2011 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, | 2011 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, |
| 2012 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, | 2012 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, |
| 2013 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, | 2013 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, |
| 2014 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, | 2014 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, |
| 2015 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, | 2015 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, |
| 2016 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, | 2016 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, |
| 2017 chromeos::switches::kDisableFilesQuickView)}, | 2017 chromeos::switches::kDisableFilesQuickView)}, |
| 2018 {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN, |
| 2019 IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS, |
| 2020 FEATURE_VALUE_TYPE(features::kQuickUnlockPin)}, |
| 2018 #endif // defined(OS_CHROMEOS) | 2021 #endif // defined(OS_CHROMEOS) |
| 2019 #if defined(OS_ANDROID) | 2022 #if defined(OS_ANDROID) |
| 2020 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME, | 2023 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME, |
| 2021 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid, | 2024 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid, |
| 2022 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)}, | 2025 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)}, |
| 2023 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, | 2026 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, |
| 2024 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, | 2027 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, |
| 2025 FEATURE_VALUE_TYPE(features::kWebPayments)}, | 2028 FEATURE_VALUE_TYPE(features::kWebPayments)}, |
| 2026 #endif // defined(OS_ANDROID) | 2029 #endif // defined(OS_ANDROID) |
| 2027 // NOTE: Adding new command-line switches requires adding corresponding | 2030 // NOTE: Adding new command-line switches requires adding corresponding |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2207 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2210 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2208 | 2211 |
| 2209 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2212 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2210 *count = arraysize(kFeatureEntries); | 2213 *count = arraysize(kFeatureEntries); |
| 2211 return kFeatureEntries; | 2214 return kFeatureEntries; |
| 2212 } | 2215 } |
| 2213 | 2216 |
| 2214 } // namespace testing | 2217 } // namespace testing |
| 2215 | 2218 |
| 2216 } // namespace about_flags | 2219 } // namespace about_flags |
| OLD | NEW |