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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 IDS_FLAGS_DISABLE_WEBGL_NAME, | 417 IDS_FLAGS_DISABLE_WEBGL_NAME, |
418 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, | 418 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, |
419 kOsDesktop, | 419 kOsDesktop, |
420 #if defined(OS_ANDROID) | 420 #if defined(OS_ANDROID) |
421 SINGLE_VALUE_TYPE("") | 421 SINGLE_VALUE_TYPE("") |
422 #else | 422 #else |
423 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) | 423 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) |
424 #endif | 424 #endif |
425 }, | 425 }, |
426 { | 426 { |
| 427 "enable-webrtc", |
| 428 IDS_FLAGS_ENABLE_WEBRTC_NAME, |
| 429 IDS_FLAGS_ENABLE_WEBRTC_DESCRIPTION, |
| 430 kOsAndroid, |
| 431 #if defined(OS_ANDROID) |
| 432 SINGLE_VALUE_TYPE(switches::kEnableWebRTC) |
| 433 #else |
| 434 SINGLE_VALUE_TYPE("") |
| 435 #endif |
| 436 }, |
| 437 { |
427 "fixed-position-creates-stacking-context", | 438 "fixed-position-creates-stacking-context", |
428 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME, | 439 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME, |
429 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_DESCRIPTION, | 440 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_DESCRIPTION, |
430 kOsAll, | 441 kOsAll, |
431 MULTI_VALUE_TYPE(kFixedPositionCreatesStackingContextChoices) | 442 MULTI_VALUE_TYPE(kFixedPositionCreatesStackingContextChoices) |
432 }, | 443 }, |
433 // TODO(bbudge): When NaCl is on by default, remove this flag entry. | 444 // TODO(bbudge): When NaCl is on by default, remove this flag entry. |
434 { | 445 { |
435 "enable-nacl", // FLAGS:RECORD_UMA | 446 "enable-nacl", // FLAGS:RECORD_UMA |
436 IDS_FLAGS_ENABLE_NACL_NAME, | 447 IDS_FLAGS_ENABLE_NACL_NAME, |
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1676 } | 1687 } |
1677 | 1688 |
1678 const Experiment* GetExperiments(size_t* count) { | 1689 const Experiment* GetExperiments(size_t* count) { |
1679 *count = num_experiments; | 1690 *count = num_experiments; |
1680 return experiments; | 1691 return experiments; |
1681 } | 1692 } |
1682 | 1693 |
1683 } // namespace testing | 1694 } // namespace testing |
1684 | 1695 |
1685 } // namespace about_flags | 1696 } // namespace about_flags |
OLD | NEW |