Chromium Code Reviews| 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 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 789 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 789 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
| 790 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 790 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
| 791 {"WebRtcUseEchoCanceller3", IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_NAME, | 791 {"WebRtcUseEchoCanceller3", IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_NAME, |
| 792 IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_DESCRIPTION, kOsAll, | 792 IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_DESCRIPTION, kOsAll, |
| 793 FEATURE_VALUE_TYPE(features::kWebRtcUseEchoCanceller3)}, | 793 FEATURE_VALUE_TYPE(features::kWebRtcUseEchoCanceller3)}, |
| 794 #endif // ENABLE_WEBRTC | 794 #endif // ENABLE_WEBRTC |
| 795 #if defined(OS_ANDROID) | 795 #if defined(OS_ANDROID) |
| 796 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 796 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
| 797 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, | 797 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, |
| 798 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 798 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
| 799 {"enable-new-photo-picker", IDS_FLAGS_NEW_PHOTO_PICKER_NAME, | |
| 800 IDS_FLAGS_NEW_PHOTO_PICKER_DESCRIPTION, kOsAndroid, | |
| 801 SINGLE_VALUE_TYPE(switches::kEnableNewPhotoPicker)}, | |
|
Michael van Ouwerkerk
2017/03/13 14:04:17
Use a FEATURE_VALUE_TYPE flag. See components/flag
Finnur
2017/03/14 14:35:40
Done.
| |
| 799 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, | 802 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, |
| 800 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, | 803 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, |
| 801 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, | 804 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, |
| 802 #endif // OS_ANDROID | 805 #endif // OS_ANDROID |
| 803 // Native client is compiled out when DISABLE_NACL is defined. | 806 // Native client is compiled out when DISABLE_NACL is defined. |
| 804 #if !defined(DISABLE_NACL) | 807 #if !defined(DISABLE_NACL) |
| 805 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 808 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
| 806 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 809 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
| 807 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, | 810 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, |
| 808 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 811 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
| (...skipping 1717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2526 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2529 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2527 | 2530 |
| 2528 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2531 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2529 *count = arraysize(kFeatureEntries); | 2532 *count = arraysize(kFeatureEntries); |
| 2530 return kFeatureEntries; | 2533 return kFeatureEntries; |
| 2531 } | 2534 } |
| 2532 | 2535 |
| 2533 } // namespace testing | 2536 } // namespace testing |
| 2534 | 2537 |
| 2535 } // namespace about_flags | 2538 } // namespace about_flags |
| OLD | NEW |