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

Side by Side Diff: chromecast/media/cdm/cast_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_ 5 #ifndef CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_
6 #define CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_ 6 #define CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chromecast/media/base/key_systems_common.h" 9 #include "chromecast/media/base/key_systems_common.h"
10 #include "chromecast/media/base/media_resource_tracker.h" 10 #include "chromecast/media/base/media_resource_tracker.h"
11 #include "media/base/cdm_factory.h" 11 #include "media/base/cdm_factory.h"
jrummell 2016/12/12 22:08:39 nit: Should include content_decryption_module.h si
xhwang 2016/12/12 22:32:50 Those are part of media::CdmFactory interface and
12 #include "media/base/media_keys.h"
13 12
14 namespace base { 13 namespace base {
15 class SingleThreadTaskRunner; 14 class SingleThreadTaskRunner;
16 } // namespace base 15 } // namespace base
17 16
18 namespace media { 17 namespace media {
19 struct CdmConfig; 18 struct CdmConfig;
20 } // namespace media 19 } // namespace media
21 20
22 namespace chromecast { 21 namespace chromecast {
(...skipping 30 matching lines...) Expand all
53 52
54 private: 53 private:
55 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 54 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
56 DISALLOW_COPY_AND_ASSIGN(CastCdmFactory); 55 DISALLOW_COPY_AND_ASSIGN(CastCdmFactory);
57 }; 56 };
58 57
59 } // namespace media 58 } // namespace media
60 } // namespace chromecast 59 } // namespace chromecast
61 60
62 #endif // CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_ 61 #endif // CHROMECAST_MEDIA_CDM_CAST_CDM_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698