diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 15:50:22 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 15:50:22 +0000 |
| commit | 35b2a970849f3e6daf1f6eccc42332d8bec6e6f3 (patch) | |
| tree | 811894cba057d8dd69c6ad06b14c5c546e4291a2 /content/renderer/media/webcontentdecryptionmodule_impl.h | |
| parent | ae195da1e844baf60ecff09543dfc541c2b1dce1 (diff) | |
| download | chromium_src-35b2a970849f3e6daf1f6eccc42332d8bec6e6f3.zip chromium_src-35b2a970849f3e6daf1f6eccc42332d8bec6e6f3.tar.gz chromium_src-35b2a970849f3e6daf1f6eccc42332d8bec6e6f3.tar.bz2 | |
Conversion of content_shell target to use WebLocalFrame.
Fairly straightforward, as the locations where I had to add conversions
should only ever expect to be called in the context of a local frame.
BUG=346764
Review URL: https://codereview.chromium.org/222973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/webcontentdecryptionmodule_impl.h')
| -rw-r--r-- | content/renderer/media/webcontentdecryptionmodule_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h index 38df1a0..ca9c218 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.h +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h @@ -11,9 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" +// TODO(dcheng): Remove and convert back to a forward declare. +#include "third_party/WebKit/public/web/WebLocalFrame.h" namespace blink { -class WebFrame; class WebSecurityOrigin; } @@ -31,7 +32,7 @@ class WebContentDecryptionModuleImpl : public blink::WebContentDecryptionModule { public: static WebContentDecryptionModuleImpl* Create( - blink::WebFrame* frame, + blink::WebLocalFrame* frame, const blink::WebSecurityOrigin& security_origin, const base::string16& key_system); |