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

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

Issue 23975003: Add widevine_cdm_version.h to gyp for android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix Created 7 years, 3 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
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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 "disable-encrypted-media", 745 "disable-encrypted-media",
746 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, 746 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
747 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, 747 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
748 kOsAll, 748 kOsAll,
749 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) 749 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia)
750 }, 750 },
751 { 751 {
752 "override-encrypted-media-canplaytype", 752 "override-encrypted-media-canplaytype",
753 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME, 753 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME,
754 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION, 754 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION,
755 kOsMac | kOsWin, 755 kOsMac | kOsWin | kOsAndroid,
756 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType) 756 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType)
757 }, 757 },
758 { 758 {
759 "enable-opus-playback", 759 "enable-opus-playback",
760 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, 760 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME,
761 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, 761 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION,
762 kOsDesktop, 762 kOsDesktop,
763 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) 763 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback)
764 }, 764 },
765 { 765 {
(...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 } 2121 }
2122 2122
2123 const Experiment* GetExperiments(size_t* count) { 2123 const Experiment* GetExperiments(size_t* count) {
2124 *count = num_experiments; 2124 *count = num_experiments;
2125 return experiments; 2125 return experiments;
2126 } 2126 }
2127 2127
2128 } // namespace testing 2128 } // namespace testing
2129 2129
2130 } // namespace about_flags 2130 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/key_systems_info.cc » ('j') | content/renderer/media/crypto/key_systems_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698