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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 1165773004: Extract the element implementation logic to function mods in <webview>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@qui
Patch Set: sync @tott Created 5 years, 6 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 | « extensions/extensions.gypi ('k') | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index b456315a2413b07459809c44241ef28086af0da3..17c6dbea1704a470c6647d2a8dd4f5a54f43ebf2 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -472,6 +472,15 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
resources.push_back(std::make_pair("guestViewDeny", IDR_GUEST_VIEW_DENY_JS));
resources.push_back(std::make_pair("guestViewEvents",
IDR_GUEST_VIEW_EVENTS_JS));
+
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kSitePerProcess)) {
+ resources.push_back(std::make_pair("guestViewIframe",
+ IDR_GUEST_VIEW_IFRAME_JS));
+ resources.push_back(std::make_pair("guestViewIframeContainer",
+ IDR_GUEST_VIEW_IFRAME_CONTAINER_JS));
+ }
+
resources.push_back(std::make_pair("imageUtil", IDR_IMAGE_UTIL_JS));
resources.push_back(std::make_pair("json_schema", IDR_JSON_SCHEMA_JS));
resources.push_back(std::make_pair("lastError", IDR_LAST_ERROR_JS));
@@ -509,6 +518,11 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
resources.push_back(std::make_pair("webViewInternal",
IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kSitePerProcess)) {
+ resources.push_back(std::make_pair("webViewIframe",
+ IDR_WEB_VIEW_IFRAME_JS));
+ }
resources.push_back(
std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS));
resources.push_back(
@@ -1417,6 +1431,11 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
module_system->Require("webView");
module_system->Require("webViewApiMethods");
module_system->Require("webViewAttributes");
+
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kSitePerProcess)) {
+ module_system->Require("webViewIframe");
+ }
}
// The "guestViewDeny" module must always be loaded last. It registers
« no previous file with comments | « extensions/extensions.gypi ('k') | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698