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

Side by Side Diff: content/renderer/media/webcontentdecryptionmodule_impl.cc

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some TODOs Created 6 years, 8 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 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 "content/renderer/media/webcontentdecryptionmodule_impl.h" 5 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 13 matching lines...) Expand all
24 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" 24 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
25 #endif 25 #endif
26 26
27 namespace blink { 27 namespace blink {
28 class WebFrame; 28 class WebFrame;
29 } 29 }
30 30
31 namespace content { 31 namespace content {
32 32
33 WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create( 33 WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create(
34 blink::WebFrame* frame, 34 blink::WebLocalFrame* frame,
35 const blink::WebSecurityOrigin& security_origin, 35 const blink::WebSecurityOrigin& security_origin,
36 const base::string16& key_system) { 36 const base::string16& key_system) {
37 DCHECK(frame); 37 DCHECK(frame);
38 DCHECK(!security_origin.isNull()); 38 DCHECK(!security_origin.isNull());
39 DCHECK(!key_system.empty()); 39 DCHECK(!key_system.empty());
40 40
41 // TODO(ddorwin): Guard against this in supported types check and remove this. 41 // TODO(ddorwin): Guard against this in supported types check and remove this.
42 // Chromium only supports ASCII key systems. 42 // Chromium only supports ASCII key systems.
43 if (!IsStringASCII(key_system)) { 43 if (!IsStringASCII(key_system)) {
44 NOTREACHED(); 44 NOTREACHED();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 return adapter_->GetDecryptor(); 82 return adapter_->GetDecryptor();
83 } 83 }
84 84
85 #if defined(OS_ANDROID) 85 #if defined(OS_ANDROID)
86 int WebContentDecryptionModuleImpl::GetCdmId() const { 86 int WebContentDecryptionModuleImpl::GetCdmId() const {
87 return adapter_->GetCdmId(); 87 return adapter_->GetCdmId();
88 } 88 }
89 #endif // defined(OS_ANDROID) 89 #endif // defined(OS_ANDROID)
90 90
91 } // namespace content 91 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698