| 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 1951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1962 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 1962 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 1963 {"new-audio-rendering-mixing-strategy", // FLAGS:RECORD_UMA | 1963 {"new-audio-rendering-mixing-strategy", // FLAGS:RECORD_UMA |
| 1964 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME, | 1964 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME, |
| 1965 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION, | 1965 IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION, |
| 1966 kOsWin | kOsMac | kOsLinux | kOsAndroid, | 1966 kOsWin | kOsMac | kOsLinux | kOsAndroid, |
| 1967 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, | 1967 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, |
| 1968 #if defined(OS_CHROMEOS) | 1968 #if defined(OS_CHROMEOS) |
| 1969 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, | 1969 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, |
| 1970 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, | 1970 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, |
| 1971 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, | 1971 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, |
| 1972 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, |
| 1973 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, |
| 1974 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, |
| 1975 chromeos::switches::kDisableFilesQuickView)}, |
| 1972 #endif // defined(OS_CHROMEOS) | 1976 #endif // defined(OS_CHROMEOS) |
| 1973 #if defined(OS_ANDROID) | 1977 #if defined(OS_ANDROID) |
| 1974 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, | 1978 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, |
| 1975 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, | 1979 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, |
| 1976 FEATURE_VALUE_TYPE(features::kWebPayments)}, | 1980 FEATURE_VALUE_TYPE(features::kWebPayments)}, |
| 1977 #endif // defined(OS_ANDROID) | 1981 #endif // defined(OS_ANDROID) |
| 1978 // NOTE: Adding new command-line switches requires adding corresponding | 1982 // NOTE: Adding new command-line switches requires adding corresponding |
| 1979 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1983 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 1980 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1984 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 1981 }; | 1985 }; |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2165 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2169 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2166 | 2170 |
| 2167 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2171 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2168 *count = arraysize(kFeatureEntries); | 2172 *count = arraysize(kFeatureEntries); |
| 2169 return kFeatureEntries; | 2173 return kFeatureEntries; |
| 2170 } | 2174 } |
| 2171 | 2175 |
| 2172 } // namespace testing | 2176 } // namespace testing |
| 2173 | 2177 |
| 2174 } // namespace about_flags | 2178 } // namespace about_flags |
| OLD | NEW |