Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 20104005: enable MSE and legacy EME by default on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/media/media_source_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 SINGLE_VALUE_TYPE(switches::kEnableSpdy4a2) 733 SINGLE_VALUE_TYPE(switches::kEnableSpdy4a2)
734 }, 734 },
735 { 735 {
736 "enable-async-dns", 736 "enable-async-dns",
737 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME, 737 IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
738 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION, 738 IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
739 kOsWin | kOsMac | kOsLinux | kOsCrOS, 739 kOsWin | kOsMac | kOsLinux | kOsCrOS,
740 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns, 740 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAsyncDns,
741 switches::kDisableAsyncDns) 741 switches::kDisableAsyncDns)
742 }, 742 },
743 #if defined(ANDROID) && !defined(GOOGLE_TV)
744 {
745 "enable-media-source",
746 IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_NAME,
747 IDS_FLAGS_ENABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
748 kOsAll,
749 SINGLE_VALUE_TYPE(switches::kEnableWebKitMediaSource)
750 },
751 #else
752 { 743 {
753 "disable-media-source", 744 "disable-media-source",
754 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, 745 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME,
755 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, 746 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION,
756 kOsAll, 747 kOsAll,
757 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) 748 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource)
758 }, 749 },
759 #endif
760 { 750 {
761 "enable-encrypted-media", 751 "enable-encrypted-media",
762 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 752 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
763 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 753 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
764 kOsDesktop, 754 kOsAll,
765 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 755 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
766 }, 756 },
767 { 757 {
768 "disable-encrypted-media", 758 "disable-encrypted-media",
769 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, 759 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
770 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, 760 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
771 kOsDesktop, 761 kOsAll,
772 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) 762 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia)
773 }, 763 },
774 { 764 {
775 "override-encrypted-media-canplaytype", 765 "override-encrypted-media-canplaytype",
776 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME, 766 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME,
777 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION, 767 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION,
778 kOsMac | kOsWin, 768 kOsMac | kOsWin,
779 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType) 769 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType)
780 }, 770 },
781 { 771 {
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2115 } 2105 }
2116 2106
2117 const Experiment* GetExperiments(size_t* count) { 2107 const Experiment* GetExperiments(size_t* count) {
2118 *count = num_experiments; 2108 *count = num_experiments;
2119 return experiments; 2109 return experiments;
2120 } 2110 }
2121 2111
2122 } // namespace testing 2112 } // namespace testing
2123 2113
2124 } // namespace about_flags 2114 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/media/media_source_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698