Chromium Code Reviews| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 561 }, | 561 }, |
| 562 { | 562 { |
| 563 "disable-webrtc-hw-encoding", | 563 "disable-webrtc-hw-encoding", |
| 564 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME, | 564 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME, |
| 565 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, | 565 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, |
| 566 kOsAndroid | kOsCrOS, | 566 kOsAndroid | kOsCrOS, |
| 567 SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding) | 567 SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding) |
| 568 }, | 568 }, |
| 569 #endif | 569 #endif |
| 570 #if defined(OS_ANDROID) | 570 #if defined(OS_ANDROID) |
| 571 #if defined(ARCH_CPU_X86) | 571 #if defined(ARCH_CPU_ARMEL) || defined(ARCH_CPU_X86) |
|
jam
2014/03/25 17:44:09
is this ifdef actually needed? afaik in our tree w
Raymond Toy
2014/03/25 17:53:05
MIPS support has been requested. But until that i
| |
| 572 { | |
| 573 "enable-webaudio", | |
| 574 IDS_FLAGS_ENABLE_WEBAUDIO_NAME, | |
| 575 IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION, | |
| 576 kOsAndroid, | |
| 577 SINGLE_VALUE_TYPE(switches::kEnableWebAudio) | |
| 578 }, | |
| 579 #else | |
| 580 { | 572 { |
| 581 "disable-webaudio", | 573 "disable-webaudio", |
| 582 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, | 574 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
| 583 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, | 575 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
| 584 kOsAndroid, | 576 kOsAndroid, |
| 585 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) | 577 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) |
| 586 }, | 578 }, |
| 587 #endif | 579 #endif |
| 588 #endif | 580 #endif |
| 589 { | 581 { |
| (...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2330 } | 2322 } |
| 2331 | 2323 |
| 2332 const Experiment* GetExperiments(size_t* count) { | 2324 const Experiment* GetExperiments(size_t* count) { |
| 2333 *count = num_experiments; | 2325 *count = num_experiments; |
| 2334 return experiments; | 2326 return experiments; |
| 2335 } | 2327 } |
| 2336 | 2328 |
| 2337 } // namespace testing | 2329 } // namespace testing |
| 2338 | 2330 |
| 2339 } // namespace about_flags | 2331 } // namespace about_flags |
| OLD | NEW |