diff options
| author | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 20:40:43 +0000 |
|---|---|---|
| committer | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-14 20:40:43 +0000 |
| commit | 596b2c45d080cd8e409b0b7de75ca1b8d77d7c73 (patch) | |
| tree | 5d4c3c81cd20d84c01e0364780479869046d21c9 /chrome | |
| parent | 4fd333306b87fa9f716c934b16351bc2291c79e2 (diff) | |
| download | chromium_src-596b2c45d080cd8e409b0b7de75ca1b8d77d7c73.zip chromium_src-596b2c45d080cd8e409b0b7de75ca1b8d77d7c73.tar.gz chromium_src-596b2c45d080cd8e409b0b7de75ca1b8d77d7c73.tar.bz2 | |
Make the Pepepr test run on the mac.
BUG=none
TESTS=none
Review URL: http://codereview.chromium.org/546041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/render_view.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 885d6eb..7cc1173 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2695,7 +2695,7 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( } } if (in_process_plugin) { -#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac. +#if defined(OS_WIN) // In-proc plugins aren't supported on Linux. if (use_pepper_host) { return WebPluginDelegatePepper::Create( path, @@ -2706,6 +2706,17 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( return WebPluginDelegateImpl::Create( path, *mime_type_to_use, gfx::NativeViewFromId(host_window_)); } +#elif defined(OS_MACOSX) + if (use_pepper_host) { + return WebPluginDelegatePepper::Create( + path, + *mime_type_to_use, + AsWeakPtr(), + host_window_); + } else { + NOTIMPLEMENTED(); + return NULL; + } #else NOTIMPLEMENTED(); return NULL; |