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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 IDS_FLAGS_ENABLE_WEBRTC_STUN_ORIGIN_DESCRIPTION, | 669 IDS_FLAGS_ENABLE_WEBRTC_STUN_ORIGIN_DESCRIPTION, |
670 kOsAll, | 670 kOsAll, |
671 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 671 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
672 #endif | 672 #endif |
673 #if defined(OS_ANDROID) | 673 #if defined(OS_ANDROID) |
674 {"disable-webaudio", | 674 {"disable-webaudio", |
675 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, | 675 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
676 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, | 676 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
677 kOsAndroid, | 677 kOsAndroid, |
678 SINGLE_VALUE_TYPE(switches::kDisableWebAudio)}, | 678 SINGLE_VALUE_TYPE(switches::kDisableWebAudio)}, |
| 679 {"enable-osk-overscroll", |
| 680 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
| 681 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, |
| 682 kOsAndroid, |
| 683 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
679 #endif | 684 #endif |
680 // Native client is compiled out when DISABLE_NACL is defined. | 685 // Native client is compiled out when DISABLE_NACL is defined. |
681 #if !defined(DISABLE_NACL) | 686 #if !defined(DISABLE_NACL) |
682 {"enable-nacl", // FLAGS:RECORD_UMA | 687 {"enable-nacl", // FLAGS:RECORD_UMA |
683 IDS_FLAGS_ENABLE_NACL_NAME, | 688 IDS_FLAGS_ENABLE_NACL_NAME, |
684 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, | 689 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
685 kOsAll, | 690 kOsAll, |
686 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 691 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, |
687 {"enable-nacl-debug", // FLAGS:RECORD_UMA | 692 {"enable-nacl-debug", // FLAGS:RECORD_UMA |
688 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, | 693 IDS_FLAGS_ENABLE_NACL_DEBUG_NAME, |
(...skipping 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2760 } | 2765 } |
2761 | 2766 |
2762 const Experiment* GetExperiments(size_t* count) { | 2767 const Experiment* GetExperiments(size_t* count) { |
2763 *count = num_experiments; | 2768 *count = num_experiments; |
2764 return experiments; | 2769 return experiments; |
2765 } | 2770 } |
2766 | 2771 |
2767 } // namespace testing | 2772 } // namespace testing |
2768 | 2773 |
2769 } // namespace about_flags | 2774 } // namespace about_flags |
OLD | NEW |