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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 614 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
615 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 615 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
616 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 616 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
617 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 617 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
618 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 618 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
619 #endif | 619 #endif |
620 #if defined(OS_ANDROID) | 620 #if defined(OS_ANDROID) |
621 {"disable-webaudio", IDS_FLAGS_WEBAUDIO_NAME, | 621 {"disable-webaudio", IDS_FLAGS_WEBAUDIO_NAME, |
622 IDS_FLAGS_WEBAUDIO_DESCRIPTION, kOsAndroid, | 622 IDS_FLAGS_WEBAUDIO_DESCRIPTION, kOsAndroid, |
623 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)}, | 623 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)}, |
| 624 {"enable-osk-overscroll", |
| 625 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
| 626 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, |
| 627 kOsAndroid, |
| 628 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
624 #endif | 629 #endif |
625 // Native client is compiled out when DISABLE_NACL is defined. | 630 // Native client is compiled out when DISABLE_NACL is defined. |
626 #if !defined(DISABLE_NACL) | 631 #if !defined(DISABLE_NACL) |
627 {"enable-nacl", // FLAGS:RECORD_UMA | 632 {"enable-nacl", // FLAGS:RECORD_UMA |
628 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 633 IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, |
629 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 634 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
630 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 635 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
631 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 636 IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, |
632 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 637 SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, |
633 {"nacl-debug-mask", // FLAGS:RECORD_UMA | 638 {"nacl-debug-mask", // FLAGS:RECORD_UMA |
(...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1994 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 1999 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
1995 | 2000 |
1996 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2001 const FeatureEntry* GetFeatureEntries(size_t* count) { |
1997 *count = arraysize(kFeatureEntries); | 2002 *count = arraysize(kFeatureEntries); |
1998 return kFeatureEntries; | 2003 return kFeatureEntries; |
1999 } | 2004 } |
2000 | 2005 |
2001 } // namespace testing | 2006 } // namespace testing |
2002 | 2007 |
2003 } // namespace about_flags | 2008 } // namespace about_flags |
OLD | NEW |