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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
628 kOsAll, | 628 kOsAll, |
629 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) | 629 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) |
630 }, | 630 }, |
631 { | 631 { |
632 "enable-encrypted-media", | 632 "enable-encrypted-media", |
633 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, | 633 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
634 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, | 634 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
635 kOsAll, | 635 kOsAll, |
636 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) | 636 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
637 }, | 637 }, |
638 { | |
639 "enable-vp9-opus-playback", | |
xhwang
2012/12/13 08:33:13
does it make sense to have two flags?
fgalligan1
2012/12/13 22:30:14
I wasn't sure about that. But I didn't want to add
Tom Finegan
2012/12/13 23:20:00
I don't think so-- I don't think there's any benef
xhwang
2012/12/14 01:19:21
sg
| |
640 IDS_FLAGS_ENABLE_VP9_OPUS_PLAYBACK_NAME, | |
641 IDS_FLAGS_ENABLE_VP9_OPUS_PLAYBACK_DESCRIPTION, | |
642 kOsAll, | |
643 SINGLE_VALUE_TYPE(switches::kEnableVp9OpusPlayback) | |
644 }, | |
638 #if defined(USE_ASH) | 645 #if defined(USE_ASH) |
639 { | 646 { |
640 "aura-google-dialog-frames", | 647 "aura-google-dialog-frames", |
641 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, | 648 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, |
642 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, | 649 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, |
643 kOsWin | kOsLinux | kOsCrOS, | 650 kOsWin | kOsLinux | kOsCrOS, |
644 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) | 651 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) |
645 }, | 652 }, |
646 { | 653 { |
647 "ash-disable-auto-window-placement", | 654 "ash-disable-auto-window-placement", |
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1617 } | 1624 } |
1618 | 1625 |
1619 const Experiment* GetExperiments(size_t* count) { | 1626 const Experiment* GetExperiments(size_t* count) { |
1620 *count = num_experiments; | 1627 *count = num_experiments; |
1621 return experiments; | 1628 return experiments; |
1622 } | 1629 } |
1623 | 1630 |
1624 } // namespace testing | 1631 } // namespace testing |
1625 | 1632 |
1626 } // namespace about_flags | 1633 } // namespace about_flags |
OLD | NEW |