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

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

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/media/encrypted_media_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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux, 693 IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux,
694 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, 694 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)},
695 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll, 695 {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll,
696 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)}, 696 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)},
697 {"enable-alternative-services", IDS_FLAGS_ALTSVC_NAME, 697 {"enable-alternative-services", IDS_FLAGS_ALTSVC_NAME,
698 IDS_FLAGS_ALTSVC_DESCRIPTION, kOsAll, 698 IDS_FLAGS_ALTSVC_DESCRIPTION, kOsAll,
699 SINGLE_VALUE_TYPE(switches::kEnableAlternativeServices)}, 699 SINGLE_VALUE_TYPE(switches::kEnableAlternativeServices)},
700 {"disable-media-source", IDS_FLAGS_MEDIA_SOURCE_NAME, 700 {"disable-media-source", IDS_FLAGS_MEDIA_SOURCE_NAME,
701 IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION, kOsAll, 701 IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION, kOsAll,
702 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableMediaSource)}, 702 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableMediaSource)},
703 {"disable-encrypted-media", IDS_FLAGS_ENCRYPTED_MEDIA_NAME,
704 IDS_FLAGS_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll,
705 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableEncryptedMedia)},
706 {"enable-prefixed-encrypted-media", IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_NAME,
707 IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll,
708 SINGLE_VALUE_TYPE(switches::kEnablePrefixedEncryptedMedia)},
709 {"disable-javascript-harmony-shipping", 703 {"disable-javascript-harmony-shipping",
710 IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_NAME, 704 IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_NAME,
711 IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, kOsAll, 705 IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, kOsAll,
712 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)}, 706 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)},
713 {"enable-javascript-harmony", IDS_FLAGS_JAVASCRIPT_HARMONY_NAME, 707 {"enable-javascript-harmony", IDS_FLAGS_JAVASCRIPT_HARMONY_NAME,
714 IDS_FLAGS_JAVASCRIPT_HARMONY_DESCRIPTION, kOsAll, 708 IDS_FLAGS_JAVASCRIPT_HARMONY_DESCRIPTION, kOsAll,
715 SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)}, 709 SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)},
716 {"disable-software-rasterizer", IDS_FLAGS_SOFTWARE_RASTERIZER_NAME, 710 {"disable-software-rasterizer", IDS_FLAGS_SOFTWARE_RASTERIZER_NAME,
717 IDS_FLAGS_SOFTWARE_RASTERIZER_DESCRIPTION, 711 IDS_FLAGS_SOFTWARE_RASTERIZER_DESCRIPTION,
718 #if defined(ENABLE_SWIFTSHADER) 712 #if defined(ENABLE_SWIFTSHADER)
(...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2030 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2037 2031
2038 const FeatureEntry* GetFeatureEntries(size_t* count) { 2032 const FeatureEntry* GetFeatureEntries(size_t* count) {
2039 *count = arraysize(kFeatureEntries); 2033 *count = arraysize(kFeatureEntries);
2040 return kFeatureEntries; 2034 return kFeatureEntries;
2041 } 2035 }
2042 2036
2043 } // namespace testing 2037 } // namespace testing
2044 2038
2045 } // namespace about_flags 2039 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698