diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:07:41 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:07:41 +0000 |
| commit | 34b27e4416a90a93a10a1555f1845ed925a8f3c4 (patch) | |
| tree | 10d4c9ef869c0bcff29e6be61dc56d672b7c8cd9 /content/renderer | |
| parent | 57065facb29ea84299a3b181ffdf7e04ab1926f4 (diff) | |
| download | chromium_src-34b27e4416a90a93a10a1555f1845ed925a8f3c4.zip chromium_src-34b27e4416a90a93a10a1555f1845ed925a8f3c4.tar.gz chromium_src-34b27e4416a90a93a10a1555f1845ed925a8f3c4.tar.bz2 | |
Disable NPAPI under Aura.
BUG=110501
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9192028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 4e4759d..59fb8de 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -3268,8 +3268,12 @@ WebKit::WebPlugin* RenderViewImpl::CreatePlugin( pepper_module.get(), params, pepper_delegate_.AsWeakPtr()); } +#if defined(USE_AURA) + return NULL; +#else return new webkit::npapi::WebPluginImpl( frame, params, info.path, AsWeakPtr()); +#endif } void RenderViewImpl::EvaluateScript(const string16& frame_xpath, |