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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
618 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, | 618 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, |
619 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 619 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
620 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, | 620 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, |
621 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, | 621 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, |
622 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 622 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
623 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 623 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
624 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 624 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
625 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 625 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
626 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 626 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
627 #endif | 627 #endif |
| 628 #if defined(OS_ANDROID) |
| 629 {"enable-osk-overscroll", |
| 630 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
| 631 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, |
| 632 kOsAndroid, |
| 633 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
| 634 #endif |
628 // Native client is compiled out when DISABLE_NACL is defined. | 635 // Native client is compiled out when DISABLE_NACL is defined. |
629 #if !defined(DISABLE_NACL) | 636 #if !defined(DISABLE_NACL) |
630 {"enable-nacl", // FLAGS:RECORD_UMA | 637 {"enable-nacl", // FLAGS:RECORD_UMA |
631 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 638 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
632 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 639 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
633 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 640 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
634 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 641 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
635 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 642 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
636 {"nacl-debug-mask", // FLAGS:RECORD_UMA | 643 {"nacl-debug-mask", // FLAGS:RECORD_UMA |
637 IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 644 IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, |
(...skipping 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2011 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2018 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2012 | 2019 |
2013 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2020 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2014 *count = arraysize(kFeatureEntries); | 2021 *count = arraysize(kFeatureEntries); |
2015 return kFeatureEntries; | 2022 return kFeatureEntries; |
2016 } | 2023 } |
2017 | 2024 |
2018 } // namespace testing | 2025 } // namespace testing |
2019 | 2026 |
2020 } // namespace about_flags | 2027 } // namespace about_flags |
OLD | NEW |