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

Side by Side Diff: media/base/key_systems.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « media/base/decoder_buffer.cc ('k') | media/base/key_systems_support_uma.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/base/key_systems.h" 5 #include "media/base/key_systems.h"
6 6
7 #include <string>
8 7
9 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
12 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
13 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
14 #include "base/time/time.h" 13 #include "base/time/time.h"
15 #include "media/base/eme_constants.h"
16 #include "media/base/key_system_info.h" 14 #include "media/base/key_system_info.h"
17 #include "media/base/key_systems_support_uma.h" 15 #include "media/base/key_systems_support_uma.h"
18 #include "media/base/media_client.h" 16 #include "media/base/media_client.h"
19 #include "media/cdm/key_system_names.h" 17 #include "media/cdm/key_system_names.h"
20 #include "third_party/widevine/cdm/widevine_cdm_common.h" 18 #include "third_party/widevine/cdm/widevine_cdm_common.h"
21 19
22 namespace media { 20 namespace media {
23 21
24 const char kClearKeyKeySystem[] = "org.w3.clearkey"; 22 const char kClearKeyKeySystem[] = "org.w3.clearkey";
25 const char kPrefixedClearKeyKeySystem[] = "webkit-org.w3.clearkey"; 23 const char kPrefixedClearKeyKeySystem[] = "webkit-org.w3.clearkey";
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 } 931 }
934 932
935 MEDIA_EXPORT void AddCodecMask( 933 MEDIA_EXPORT void AddCodecMask(
936 EmeMediaType media_type, 934 EmeMediaType media_type,
937 const std::string& codec, 935 const std::string& codec,
938 uint32 mask) { 936 uint32 mask) {
939 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); 937 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
940 } 938 }
941 939
942 } // namespace media 940 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decoder_buffer.cc ('k') | media/base/key_systems_support_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698