| 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 2048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2059 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME, | 2059 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME, |
| 2060 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS, | 2060 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS, |
| 2061 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, | 2061 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, |
| 2062 #endif // OS_CHROMEOS | 2062 #endif // OS_CHROMEOS |
| 2063 #if !defined(OS_ANDROID) | 2063 #if !defined(OS_ANDROID) |
| 2064 {"enable-default-media-session", | 2064 {"enable-default-media-session", |
| 2065 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, | 2065 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, |
| 2066 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, | 2066 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, |
| 2067 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, | 2067 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, |
| 2068 #endif // !OS_ANDROID | 2068 #endif // !OS_ANDROID |
| 2069 #if defined(OS_ANDROID) |
| 2070 {"modal-permission-prompts", IDS_FLAGS_MODAL_PERMISSION_PROMPTS_NAME, |
| 2071 IDS_FLAGS_MODAL_PERMISSION_PROMPTS_DESCRIPTION, kOsAndroid, |
| 2072 FEATURE_VALUE_TYPE(features::kModalPermissionPrompts)}, |
| 2073 #endif |
| 2074 #if !defined(OS_MACOSX) |
| 2075 {"permission-prompt-persistence-toggle", |
| 2076 IDS_FLAGS_PERMISSION_PROMPT_PERSISTENCE_TOGGLE_NAME, |
| 2077 IDS_FLAGS_PERMISSION_PROMPT_PERSISTENCE_TOGGLE_DESCRIPTION, |
| 2078 kOsWin | kOsCrOS | kOsLinux | kOsAndroid, |
| 2079 FEATURE_VALUE_TYPE( |
| 2080 features::kDisplayPersistenceToggleInPermissionPrompts)}, |
| 2081 #endif |
| 2069 #if defined(ENABLE_PRINT_PREVIEW) | 2082 #if defined(ENABLE_PRINT_PREVIEW) |
| 2070 {"print-scaling", IDS_FLAGS_PRINT_SCALING_NAME, | 2083 {"print-scaling", IDS_FLAGS_PRINT_SCALING_NAME, |
| 2071 IDS_FLAGS_PRINT_SCALING_DESCRIPTION, kOsDesktop, | 2084 IDS_FLAGS_PRINT_SCALING_DESCRIPTION, kOsDesktop, |
| 2072 FEATURE_VALUE_TYPE(features::kPrintScaling)}, | 2085 FEATURE_VALUE_TYPE(features::kPrintScaling)}, |
| 2073 #endif | 2086 #endif |
| 2074 // NOTE: Adding new command-line switches requires adding corresponding | 2087 // NOTE: Adding new command-line switches requires adding corresponding |
| 2075 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2088 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2076 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2089 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2077 }; | 2090 }; |
| 2078 | 2091 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2272 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2285 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2273 | 2286 |
| 2274 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2287 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2275 *count = arraysize(kFeatureEntries); | 2288 *count = arraysize(kFeatureEntries); |
| 2276 return kFeatureEntries; | 2289 return kFeatureEntries; |
| 2277 } | 2290 } |
| 2278 | 2291 |
| 2279 } // namespace testing | 2292 } // namespace testing |
| 2280 | 2293 |
| 2281 } // namespace about_flags | 2294 } // namespace about_flags |
| OLD | NEW |