Split pnacl and nacl mime types

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 539 matching lines @@
               ChromeViewHostMsg_GetPluginInfo_Status::kNPAPINotSupported;
     }
 #endif
 
     switch (status_value) {
       case ChromeViewHostMsg_GetPluginInfo_Status::kNotFound: {
         NOTREACHED();
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kAllowed: {
-        const char* kNaClMimeType = "application/x-nacl";
-        const bool is_nacl_mime_type = actual_mime_type == kNaClMimeType;
-        const bool is_nacl_plugin =
-            plugin.name ==
-            ASCIIToUTF16(chrome::ChromeContentClient::kNaClPluginName);
-        bool is_nacl_unrestricted;
-        if (is_nacl_plugin) {
-          is_nacl_unrestricted = CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableNaCl);
-        } else {
-          // If this is an external plugin that handles the NaCl mime type, we
-          // allow Native Client, so Native Client's integration tests work.
-          is_nacl_unrestricted = true;
-        }
-        if (is_nacl_plugin || is_nacl_mime_type) {
-          GURL manifest_url;
-          GURL app_url;
-          if (is_nacl_mime_type) {
-            // Normal NaCl embed. The app URL is the page URL.
-            manifest_url = url;
-            app_url = frame->top()->document().url();
-          } else {
-            // NaCl is being invoked as a content handler. Look up the NaCl
-            // module using the MIME type. The app URL is the manifest URL.
-            manifest_url = GetNaClContentHandlerURL(actual_mime_type, plugin);
-            app_url = manifest_url;
-          }
-          const Extension* extension =
-              g_current_client->extension_dispatcher_->extensions()->
-                  GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url));
-          if (!IsNaClAllowed(manifest_url,
-                             app_url,
-                             is_nacl_unrestricted,
-                             extension,
-                             &params)) {
+        const char* kPnaclMimeType = "application/x-pnacl";
+        if (actual_mime_type == kPnaclMimeType) {
+          if (!CommandLine::ForCurrentProcess()->HasSwitch(
+                  switches::kEnablePnacl)) {
             frame->addMessageToConsole(
                 WebConsoleMessage(
                     WebConsoleMessage::LevelError,
-                    "Only unpacked extensions and apps installed from the "
-                    "Chrome Web Store can load NaCl modules without enabling "
-                    "Native Client in about:flags."));
+                    "Portable Native Client must be enabled in about:flags."));
             placeholder = PluginPlaceholder::CreateBlockedPlugin(
                 render_view, frame, params, plugin, identifier, group_name,
                 IDR_BLOCKED_PLUGIN_HTML,
 #if defined(OS_CHROMEOS)
                 l10n_util::GetStringUTF16(IDS_NACL_PLUGIN_BLOCKED));

[jvoung (off chromium), 2013/06/06 22:41:25]

Hmm, I guess the message is pretty generic (doesn't mention NaCl at all), so we
can use it for both NaCl and PNaCl...

[sehr, 2013/06/07 23:34:47]

I was hoping you'd say that :-).  I will change it if needed.

 #else
                 l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
 #endif
-            break;
+              break;
+          }
+        } else {
+          const char* kNaClMimeType = "application/x-nacl";
+          const bool is_nacl_mime_type = actual_mime_type == kNaClMimeType;
+          const bool is_nacl_plugin =
+              plugin.name ==
+              ASCIIToUTF16(chrome::ChromeContentClient::kNaClPluginName);
+          bool is_nacl_unrestricted;
+          if (is_nacl_plugin) {
+            is_nacl_unrestricted = CommandLine::ForCurrentProcess()->HasSwitch(
+                switches::kEnableNaCl);
+          } else {
+            // If this is an external plugin that handles the NaCl mime type, we
+            // allow Native Client, so Native Client's integration tests work.
+            is_nacl_unrestricted = true;
+          }
+          if (is_nacl_plugin || is_nacl_mime_type) {
+            GURL manifest_url;
+            GURL app_url;
+            if (is_nacl_mime_type) {
+              // Normal NaCl embed. The app URL is the page URL.
+              manifest_url = url;
+              app_url = frame->top()->document().url();
+            } else {
+              // NaCl is being invoked as a content handler. Look up the NaCl
+              // module using the MIME type. The app URL is the manifest URL.
+              manifest_url = GetNaClContentHandlerURL(actual_mime_type, plugin);
+              app_url = manifest_url;
+            }
+            const Extension* extension =
+                g_current_client->extension_dispatcher_->extensions()->
+                    GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url));
+            if (!IsNaClAllowed(manifest_url,
+                               app_url,
+                               is_nacl_unrestricted,
+                               extension,
+                               &params)) {
+              frame->addMessageToConsole(
+                  WebConsoleMessage(
+                      WebConsoleMessage::LevelError,
+                      "Only unpacked extensions and apps installed from the "
+                      "Chrome Web Store can load NaCl modules without enabling "
+                      "Native Client in about:flags."));
+              placeholder = PluginPlaceholder::CreateBlockedPlugin(
+                  render_view, frame, params, plugin, identifier, group_name,
+                  IDR_BLOCKED_PLUGIN_HTML,
+#if defined(OS_CHROMEOS)
+                  l10n_util::GetStringUTF16(IDS_NACL_PLUGIN_BLOCKED));
+#else
+                  l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
+#endif
+              break;
+            }
           }
         }
 
         // Delay loading plugins if prerendering.
         // TODO(mmenke):  In the case of prerendering, feed into
         //                ChromeContentRendererClient::CreatePlugin instead, to
         //                reduce the chance of future regressions.
         if (prerender::PrerenderHelper::IsPrerendering(render_view)) {
           placeholder = PluginPlaceholder::CreateBlockedPlugin(
               render_view, frame, params, plugin, identifier, group_name,
@@ skipping 574 matching lines @@
 
   if (container->element().shadowHost().isNull())
     return false;
 
   WebString tag_name = container->element().shadowHost().tagName();
   return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
     tag_name.equals(WebString::fromUTF8(kAdViewTagName));
 }
 
 }  // namespace chrome