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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 #endif | 518 #endif |
519 #if defined(OS_ANDROID) | 519 #if defined(OS_ANDROID) |
520 { | 520 { |
521 "disable-webaudio", | 521 "disable-webaudio", |
522 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, | 522 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
523 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, | 523 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
524 kOsAndroid, | 524 kOsAndroid, |
525 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) | 525 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) |
526 }, | 526 }, |
527 #endif | 527 #endif |
528 { | |
529 "enable-compositing-for-transition", | |
530 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, | |
531 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, | |
532 kOsAll, | |
533 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableCompositingForTransition, | |
534 switches::kDisableCompositingForTransition) | |
535 }, | |
536 // Native client is compiled out when DISABLE_NACL is defined. | 528 // Native client is compiled out when DISABLE_NACL is defined. |
537 #if !defined(DISABLE_NACL) | 529 #if !defined(DISABLE_NACL) |
538 { | 530 { |
539 "enable-nacl", // FLAGS:RECORD_UMA | 531 "enable-nacl", // FLAGS:RECORD_UMA |
540 IDS_FLAGS_ENABLE_NACL_NAME, | 532 IDS_FLAGS_ENABLE_NACL_NAME, |
541 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, | 533 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
542 kOsAll, | 534 kOsAll, |
543 SINGLE_VALUE_TYPE(switches::kEnableNaCl) | 535 SINGLE_VALUE_TYPE(switches::kEnableNaCl) |
544 }, | 536 }, |
545 { | 537 { |
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2657 } | 2649 } |
2658 | 2650 |
2659 const Experiment* GetExperiments(size_t* count) { | 2651 const Experiment* GetExperiments(size_t* count) { |
2660 *count = num_experiments; | 2652 *count = num_experiments; |
2661 return experiments; | 2653 return experiments; |
2662 } | 2654 } |
2663 | 2655 |
2664 } // namespace testing | 2656 } // namespace testing |
2665 | 2657 |
2666 } // namespace about_flags | 2658 } // namespace about_flags |
OLD | NEW |