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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 1983183003: Do not try to load "guestViewIframe" module when guest view internal isn't (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | 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 8c6f3197b6dd125d6d7f30b2ff460f1a690826da..3fa16af8ade7dd50d771e811dfeb0495c5c88424 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -1558,20 +1558,24 @@ v8::Local<v8::Object> Dispatcher::GetOrCreateBindObjectIfAvailable(
void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
Feature::Context context_type = context->context_type();
ModuleSystem* module_system = context->module_system();
+ bool requires_guest_view_module = false;
// Require AppView.
if (context->GetAvailability("appViewEmbedderInternal").is_available()) {
+ requires_guest_view_module = true;
module_system->Require("appView");
}
// Require ExtensionOptions.
if (context->GetAvailability("extensionOptionsInternal").is_available()) {
+ requires_guest_view_module = true;
module_system->Require("extensionOptions");
module_system->Require("extensionOptionsAttributes");
}
// Require ExtensionView.
if (context->GetAvailability("extensionViewInternal").is_available()) {
+ requires_guest_view_module = true;
module_system->Require("extensionView");
module_system->Require("extensionViewApiMethods");
module_system->Require("extensionViewAttributes");
@@ -1579,6 +1583,7 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
// Require WebView.
if (context->GetAvailability("webViewInternal").is_available()) {
+ requires_guest_view_module = true;
module_system->Require("webView");
module_system->Require("webViewApiMethods");
module_system->Require("webViewAttributes");
@@ -1588,7 +1593,8 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
}
}
- if (content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ if (requires_guest_view_module &&
+ content::BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
module_system->Require("guestViewIframe");
module_system->Require("guestViewIframeContainer");
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698