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

Unified Diff: chrome/renderer/render_view.cc

Issue 113637: Wire up windowless plugins. Mostly Mac related, some cross (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/plugin/webplugin_proxy.cc ('k') | chrome/renderer/webplugin_delegate_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 20445)
+++ chrome/renderer/render_view.cc (working copy)
@@ -1762,7 +1762,6 @@
const std::string& mime_type,
const std::string& clsid,
std::string* actual_mime_type) {
-#if defined(OS_WIN) || defined(OS_LINUX)
if (!PluginChannelHost::IsListening())
return NULL;
@@ -1783,13 +1782,16 @@
else
mime_type_to_use = mime_type;
-#if !defined(OS_LINUX) // In-proc plugins aren't supported on Linux.
if (RenderProcess::current()->in_process_plugins()) {
+#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac.
return WebPluginDelegate::Create(path,
mime_type_to_use,
gfx::NativeViewFromId(host_window_));
- }
+#else
+ NOTIMPLEMENTED();
+ return NULL;
#endif
+ }
WebPluginDelegateProxy* proxy =
WebPluginDelegateProxy::Create(url, mime_type_to_use, clsid, this);
@@ -1799,11 +1801,6 @@
plugin_delegates_.push_back(proxy);
return proxy;
-#else
- // TODO(port): Plugins currently not supported
- NOTIMPLEMENTED();
- return NULL;
-#endif
}
WebKit::WebMediaPlayer* RenderView::CreateWebMediaPlayer(
« no previous file with comments | « chrome/plugin/webplugin_proxy.cc ('k') | chrome/renderer/webplugin_delegate_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698