Enable <adview> tag for packaged apps.

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 <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 113 matching lines @@
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
 
 namespace {
 
 const char kWebViewTagName[] = "WEBVIEW";
+const char kAdViewTagName[] = "ADVIEW";
 
 // Explicitly register all extension ManifestHandlers needed to parse
 // fields used in the renderer.
 void RegisterExtensionManifestHandlers() {
   (new extensions::BackgroundManifestHandler)->Register();
   (new extensions::DevToolsPageHandler)->Register();
   (new extensions::WebAccessibleResourcesHandler)->Register();
   (new extensions::PageActionHandler)->Register();
   (new extensions::CSPHandler(false))->Register();  // not platform app.
   (new extensions::CSPHandler(true))->Register();  // platform app.
@@ skipping 247 matching lines @@
     const WebPluginParams& params,
     WebPlugin** plugin) {
   std::string orig_mime_type = params.mimeType.utf8();
   if (orig_mime_type == content::kBrowserPluginMimeType) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBrowserPluginForAllViewTypes))
       return false;
     WebDocument document = frame->document();
     const Extension* extension =
         GetExtension(document.securityOrigin());
-    if (extension && extension->HasAPIPermission(
-        extensions::APIPermission::kWebView))
-      return false;
+    if (extension) {
+      const extensions::APIPermission::ID perms[] = {
+        extensions::APIPermission::kWebView,
+        extensions::APIPermission::kAdView
+      };
+      for (size_t i = 0; i < arraysize(perms); ++i) {
+        if (extension->HasAPIPermission(perms[i]))
+          return false;
+      }
+    }
   }
 
   ChromeViewHostMsg_GetPluginInfo_Output output;
 #if defined(ENABLE_PLUGINS)
   render_view->Send(new ChromeViewHostMsg_GetPluginInfo(
       render_view->GetRoutingID(), GURL(params.url),
       frame->top()->document().url(), orig_mime_type, &output));
 #else
   output.status.value = ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
 #endif
@@ skipping 694 matching lines @@
 #endif
 }
 
 bool ChromeContentRendererClient::AllowBrowserPlugin(
     WebKit::WebPluginContainer* container) const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes))
     return true;
 
   // If this |BrowserPlugin| <object> in the |container| is not inside a
-  // <webview> shadowHost, we disable instantiating this plugin. This is to
-  // discourage and prevent developers from accidentally attaching <object>
-  // directly in apps.
+  // <webview>/<adview> shadowHost, we disable instantiating this plugin. This
+  // is to discourage and prevent developers from accidentally attaching
+  // <object> directly in apps.
   //
   // Note that this check below does *not* ensure any security, it is still
   // possible to bypass this check.
   // TODO(lazyboy): http://crbug.com/178663, Ensure we properly disallow
-  // instantiating BrowserPlugin outside of the <webview> shim.
+  // instantiating BrowserPlugin outside of the <webview>/<adview> shim.
   if (container->element().isNull())
     return false;
 
   if (container->element().shadowHost().isNull())
     return false;
 
-  return container->element().shadowHost().tagName().equals(
-      WebString::fromUTF8(kWebViewTagName));
+  WebString tagName = container->element().shadowHost().tagName();
+  return tagName.equals(WebString::fromUTF8(kWebViewTagName)) ||

[darin (slow to review), 2013/03/20 04:59:30]

nit: use google C++ style variable naming conventions, so tagName -> tag_name

[rpaquay, 2013/03/20 16:24:45]

Done.

+    tagName.equals(WebString::fromUTF8(kAdViewTagName));
 }
 
 }  // namespace chrome