| 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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 606     {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, | 606     {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, | 
| 607      IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 607      IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 
| 608      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, | 608      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, | 
| 609     {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, | 609     {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, | 
| 610      IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 610      IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 
| 611      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 611      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 
| 612     {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 612     {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 
| 613      IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 613      IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 
| 614      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 614      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 
| 615 #endif | 615 #endif | 
|  | 616 #if defined(OS_ANDROID) | 
|  | 617     {"enable-osk-overscroll", | 
|  | 618      IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 
|  | 619      IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, | 
|  | 620      kOsAndroid, | 
|  | 621      SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 
|  | 622 #endif | 
| 616   // Native client is compiled out when DISABLE_NACL is defined. | 623   // Native client is compiled out when DISABLE_NACL is defined. | 
| 617 #if !defined(DISABLE_NACL) | 624 #if !defined(DISABLE_NACL) | 
| 618     {"enable-nacl",  // FLAGS:RECORD_UMA | 625     {"enable-nacl",  // FLAGS:RECORD_UMA | 
| 619      IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 626      IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, | 
| 620      SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 627      SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 
| 621     {"enable-nacl-debug",  // FLAGS:RECORD_UMA | 628     {"enable-nacl-debug",  // FLAGS:RECORD_UMA | 
| 622      IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 629      IDS_FLAGS_NACL_DEBUG_NAME, IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, | 
| 623      SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 630      SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)}, | 
| 624     {"nacl-debug-mask",  // FLAGS:RECORD_UMA | 631     {"nacl-debug-mask",  // FLAGS:RECORD_UMA | 
| 625      IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 632      IDS_FLAGS_NACL_DEBUG_MASK_NAME, IDS_FLAGS_NACL_DEBUG_MASK_DESCRIPTION, | 
| (...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2002 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2009 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 
| 2003 | 2010 | 
| 2004 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2011 const FeatureEntry* GetFeatureEntries(size_t* count) { | 
| 2005   *count = arraysize(kFeatureEntries); | 2012   *count = arraysize(kFeatureEntries); | 
| 2006   return kFeatureEntries; | 2013   return kFeatureEntries; | 
| 2007 } | 2014 } | 
| 2008 | 2015 | 
| 2009 }  // namespace testing | 2016 }  // namespace testing | 
| 2010 | 2017 | 
| 2011 }  // namespace about_flags | 2018 }  // namespace about_flags | 
| OLD | NEW | 
|---|