NaCl-Chrome integration - step 1

chrome/renderer/render_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2320 matching lines @@
       url, policy_url, mime_type, &path, actual_mime_type));
   if (path.value().empty())
     return NULL;
 
   const std::string* mime_type_to_use;
   if (!actual_mime_type->empty())
     mime_type_to_use = actual_mime_type;
   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_));
 #else
     NOTIMPLEMENTED();
     return NULL;
 #endif
   }
 
   return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr());
@@ skipping 1219 matching lines @@
     modal_dialog_event_->Signal();
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   if (--modal_dialog_count_ == 0)
     modal_dialog_event_->Reset();
 
   return rv;
 }