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

Side by Side Diff: content/renderer/media/crypto/encrypted_media_player_support_impl.h

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 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
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 CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "content/renderer/media/crypto/encrypted_media_player_support.h"
13 #include "content/renderer/media/crypto/proxy_decryptor.h" 12 #include "content/renderer/media/crypto/proxy_decryptor.h"
13 #include "media/blink/encrypted_media_player_support.h"
14 14
15 namespace blink { 15 namespace blink {
16 class WebMediaPlayerClient; 16 class WebMediaPlayerClient;
17 } 17 }
18 18
19 namespace content { 19 namespace content {
20 20
21 class WebContentDecryptionModuleImpl; 21 class WebContentDecryptionModuleImpl;
22 22
23 class EncryptedMediaPlayerSupportImpl 23 class EncryptedMediaPlayerSupportImpl
24 : public EncryptedMediaPlayerSupport, 24 : public media::EncryptedMediaPlayerSupport,
25 public base::SupportsWeakPtr<EncryptedMediaPlayerSupportImpl> { 25 public base::SupportsWeakPtr<EncryptedMediaPlayerSupportImpl> {
26 public: 26 public:
27 static scoped_ptr<EncryptedMediaPlayerSupport> Create( 27 static scoped_ptr<EncryptedMediaPlayerSupport> Create(
28 blink::WebMediaPlayerClient* client); 28 blink::WebMediaPlayerClient* client);
29 29
30 virtual ~EncryptedMediaPlayerSupportImpl(); 30 virtual ~EncryptedMediaPlayerSupportImpl();
31 31
32 // EncryptedMediaPlayerSupport implementation. 32 // EncryptedMediaPlayerSupport implementation.
33 virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( 33 virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
34 blink::WebLocalFrame* frame, 34 blink::WebLocalFrame* frame,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // setContentDecryptionModule(). 120 // setContentDecryptionModule().
121 WebContentDecryptionModuleImpl* web_cdm_; 121 WebContentDecryptionModuleImpl* web_cdm_;
122 122
123 media::DecryptorReadyCB decryptor_ready_cb_; 123 media::DecryptorReadyCB decryptor_ready_cb_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupportImpl); 125 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupportImpl);
126 }; 126 };
127 } 127 }
128 128
129 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_ 129 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698