diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 15:53:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 15:53:50 +0000 |
| commit | 12bc28fcb86a370d67ee2a20895e9bbb008b7f86 (patch) | |
| tree | d1f7ff8512839207e3bfa55528ffaf1dc892becf /content | |
| parent | d212e5c28c8a9f890b16f13eaedd347fa87cd618 (diff) | |
| download | chromium_src-12bc28fcb86a370d67ee2a20895e9bbb008b7f86.zip chromium_src-12bc28fcb86a370d67ee2a20895e9bbb008b7f86.tar.gz chromium_src-12bc28fcb86a370d67ee2a20895e9bbb008b7f86.tar.bz2 | |
Make plugins work in content_shell.
BUG=90445
Review URL: http://codereview.chromium.org/7977014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_shell.gypi | 1 | ||||
| -rw-r--r-- | content/shell/shell_content_renderer_client.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 8d913ac..9b61b84 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -22,6 +22,7 @@ 'content_worker', '../skia/skia.gyp:skia', '../ui/ui.gyp:ui', + '../v8/tools/gyp/v8.gyp:v8', ], 'include_dirs': [ '..', diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc index 72b04b7..ad44d22 100644 --- a/content/shell/shell_content_renderer_client.cc +++ b/content/shell/shell_content_renderer_client.cc @@ -4,6 +4,7 @@ #include "content/shell/shell_content_renderer_client.h" +#include "content/renderer/render_view.h" #include "v8/include/v8.h" namespace content { @@ -32,7 +33,7 @@ WebKit::WebPlugin* ShellContentRendererClient::CreatePlugin( RenderView* render_view, WebKit::WebFrame* frame, const WebKit::WebPluginParams& params) { - return NULL; + return render_view->CreatePluginNoCheck(frame, params); } void ShellContentRendererClient::ShowErrorPage(RenderView* render_view, |