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

Side by Side Diff: content/renderer/media/cdm/render_cdm_factory.h

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: Created 4 years 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
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 #ifndef CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "media/base/cdm_factory.h" 13 #include "media/base/cdm_factory.h"
jrummell 2016/12/12 22:08:39 nit: I think including content_decryption_module.h
xhwang 2016/12/12 22:32:50 ditto, cdm_factory.h covers it
14 #include "media/base/media_keys.h"
15 #include "ppapi/features/features.h" 14 #include "ppapi/features/features.h"
16 15
17 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 16 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
18 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h" 17 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
19 #endif 18 #endif
20 19
21 class GURL; 20 class GURL;
22 21
23 namespace media { 22 namespace media {
24 struct CdmConfig; 23 struct CdmConfig;
(...skipping 30 matching lines...) Expand all
55 #endif 54 #endif
56 55
57 base::ThreadChecker thread_checker_; 56 base::ThreadChecker thread_checker_;
58 57
59 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory); 58 DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory);
60 }; 59 };
61 60
62 } // namespace content 61 } // namespace content
63 62
64 #endif // CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_ 63 #endif // CONTENT_RENDERER_MEDIA_CDM_RENDER_CDM_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698