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

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 23653012: Support webview tag in component extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: only inject denyWebView for platform apps Created 7 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/common/extensions/api/_permission_features.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index ce2408f603efa9981090d4b2242f9c4b04652aef..4fa1d4c3cc4d384b68e7534d2a7054d2916919e0 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -479,8 +479,7 @@ void Dispatcher::WebKitInitialized() {
InitOriginPermissions(extension);
}
- if (IsWithinPlatformApp())
- EnableCustomElementWhiteList();
+ EnableCustomElementWhiteList();
is_webkit_initialized_ = true;
}
@@ -1114,11 +1113,7 @@ void Dispatcher::DidCreateScriptContext(
module_system->Require("windowControls");
}
- // Only platform apps support the <webview> tag, because the "webView" and
- // "denyWebView" modules will affect the performance of DOM modifications
- // (http://crbug.com/196453).
- if (context_type == Feature::BLESSED_EXTENSION_CONTEXT &&
- is_within_platform_app) {
+ if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
// Note: setting up the WebView class here, not the chrome.webview API.
// The API will be automatically set up when first used.
if (extension->HasAPIPermission(APIPermission::kWebView)) {
@@ -1140,7 +1135,9 @@ void Dispatcher::DidCreateScriptContext(
}
if (includeExperimental)
module_system->Require("webViewExperimental");
- } else {
+ } else if (is_within_platform_app) {
+ // Only inject the "denyWebView" module for platform apps, since it will
+ // affect the performance of DOM modifications (http://crbug.com/196453).
module_system->Require("denyWebView");
}
}
@@ -1252,8 +1249,7 @@ void Dispatcher::OnActivateExtension(const std::string& extension_id) {
extension->url(),
string16());
- if (IsWithinPlatformApp())
- EnableCustomElementWhiteList();
+ EnableCustomElementWhiteList();
}
}
« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698