Enable web components for shell windows based on their render view type, rather than their origin.

chrome/renderer/chrome_render_view_observer.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_render_view_observer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/thumbnail_support.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/extensions/dispatcher.h"
+#include "chrome/renderer/extensions/extension_helper.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/frame_sniffer.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "chrome/renderer/translate_helper.h"
 #include "chrome/renderer/webview_animating_overlay.h"
 #include "chrome/renderer/webview_color_overlay.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ skipping 488 matching lines @@
     // Titlebars in app windows are implmented via Shadow DOM.
     if (extension->HasAPIPermission(APIPermission::kAppWindow))
       return true;
 
     // The <browser> tag is implemented via Shadow DOM.
     if (extension->HasAPIPermission(APIPermission::kBrowserTag))
       return true;
 
     if (extension->HasAPIPermission(APIPermission::kExperimental))
       return true;
+  } else {
+    // When a packaged app opens a window with a sandboxed resource, the origin
+    // will be unique (i.e. the empty string), so the fact that it is a shell
+    // window must be deduced from the view type instead to enable web
+    // components for HTML titlebars.
+    extensions::ExtensionHelper* helper =
+        extensions::ExtensionHelper::Get(render_view());
+    if (helper->view_type() == chrome::VIEW_TYPE_APP_SHELL)
+      return true;
   }
 
   return false;
 }
 
 bool ChromeRenderViewObserver::allowHTMLNotifications(
     const WebDocument& document) {
   WebSecurityOrigin origin = document.securityOrigin();
   const extensions::Extension* extension = GetExtension(origin);
   return extension && extension->HasAPIPermission(APIPermission::kNotification);
@@ skipping 575 matching lines @@
         reinterpret_cast<const unsigned char*>(&data[0]);
 
     return decoder.Decode(src_data, data.size());
   }
   return SkBitmap();
 }
 
 bool ChromeRenderViewObserver::IsStrictSecurityHost(const std::string& host) {
   return (strict_security_hosts_.find(host) != strict_security_hosts_.end());
 }