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

Unified Diff: chrome/renderer/render_view.cc

Issue 546041: Make the Pepper test run on the mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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 | « build/all.gyp ('k') | webkit/glue/plugins/plugin_list_mac.mm » ('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 36261)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2695,7 +2695,7 @@
}
}
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 @@
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;
« no previous file with comments | « build/all.gyp ('k') | webkit/glue/plugins/plugin_list_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698