| 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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 613      IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, | 613      IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, | 
| 614      kOsAll, | 614      kOsAll, | 
| 615      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 615      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 
| 616 #endif | 616 #endif | 
| 617 #if defined(OS_ANDROID) | 617 #if defined(OS_ANDROID) | 
| 618     {"disable-webaudio", | 618     {"disable-webaudio", | 
| 619      IDS_FLAGS_WEBAUDIO_NAME, | 619      IDS_FLAGS_WEBAUDIO_NAME, | 
| 620      IDS_FLAGS_WEBAUDIO_DESCRIPTION, | 620      IDS_FLAGS_WEBAUDIO_DESCRIPTION, | 
| 621      kOsAndroid, | 621      kOsAndroid, | 
| 622      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)}, | 622      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)}, | 
|  | 623     {"enable-osk-overscroll", | 
|  | 624      IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 
|  | 625      IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, | 
|  | 626      kOsAndroid, | 
|  | 627      SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 
| 623 #endif | 628 #endif | 
| 624   // Native client is compiled out when DISABLE_NACL is defined. | 629   // Native client is compiled out when DISABLE_NACL is defined. | 
| 625 #if !defined(DISABLE_NACL) | 630 #if !defined(DISABLE_NACL) | 
| 626     {"enable-nacl",  // FLAGS:RECORD_UMA | 631     {"enable-nacl",  // FLAGS:RECORD_UMA | 
| 627      IDS_FLAGS_NACL_NAME, | 632      IDS_FLAGS_NACL_NAME, | 
| 628      IDS_FLAGS_NACL_DESCRIPTION, | 633      IDS_FLAGS_NACL_DESCRIPTION, | 
| 629      kOsAll, | 634      kOsAll, | 
| 630      SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 635      SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, | 
| 631     {"enable-nacl-debug",  // FLAGS:RECORD_UMA | 636     {"enable-nacl-debug",  // FLAGS:RECORD_UMA | 
| 632      IDS_FLAGS_NACL_DEBUG_NAME, | 637      IDS_FLAGS_NACL_DEBUG_NAME, | 
| (...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2359 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 
| 2355 | 2360 | 
| 2356 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2361 const FeatureEntry* GetFeatureEntries(size_t* count) { | 
| 2357   *count = arraysize(kFeatureEntries); | 2362   *count = arraysize(kFeatureEntries); | 
| 2358   return kFeatureEntries; | 2363   return kFeatureEntries; | 
| 2359 } | 2364 } | 
| 2360 | 2365 | 
| 2361 }  // namespace testing | 2366 }  // namespace testing | 
| 2362 | 2367 | 
| 2363 }  // namespace about_flags | 2368 }  // namespace about_flags | 
| OLD | NEW | 
|---|