Index: chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
index 253dd2c13bf985f20e5af937e8a086ddbd069889..0ea50f92a202710ec9d8569964c028f5010d974c 100644 |
--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
@@ -289,6 +289,7 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules( |
// The API will be automatically set up when first used. |
if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT || |
context_type == extensions::Feature::UNBLESSED_EXTENSION_CONTEXT) { |
+ // TODO(fsamuel): Use context->GetAvailability("webViewInternal"). |
if (extension->permissions_data()->HasAPIPermission( |
extensions::APIPermission::kWebView)) { |
module_system->Require("webView"); |
@@ -313,6 +314,7 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules( |
} |
if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT) { |
+ // TODO(fsamuel): Use context->GetAvailability("appViewInternal"). |
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppView) && |
extension->permissions_data()->HasAPIPermission( |
extensions::APIPermission::kAppView)) { |
@@ -322,10 +324,8 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules( |
} |
} |
- if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT && |
- extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() && |
- extension->permissions_data()->HasAPIPermission( |
- extensions::APIPermission::kEmbeddedExtensionOptions)) { |
+ if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() && |
+ context->GetAvailability("extensionOptionsInternal").is_available()) { |
module_system->Require("extensionOptions"); |
} |
} |