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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/render_view.cc

Issue 207025: NaCl-Chrome integration (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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/renderer/render_process.cc ('k') | ipc/ipc_message_utils.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 26533)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2281,7 +2281,13 @@
else
mime_type_to_use = &mime_type;
- if (RenderProcess::current()->in_process_plugins()) {
+ bool in_process_plugin = RenderProcess::current()->in_process_plugins();
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) {
+ if (mime_type == "application/x-nacl-srpc") {
+ in_process_plugin = true;
+ }
+ }
+ if (in_process_plugin) {
#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac.
return WebPluginDelegateImpl::Create(
path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
« no previous file with comments | « chrome/renderer/render_process.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698