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 cdb175adb3b15c33f3d903d67f3190bda8178a30..253dd2c13bf985f20e5af937e8a086ddbd069889 100644 |
--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc |
@@ -262,10 +262,11 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap( |
} |
void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules( |
- extensions::ModuleSystem* module_system, |
- const extensions::Extension* extension, |
- extensions::Feature::Context context_type, |
+ extensions::ScriptContext* context, |
bool is_within_platform_app) { |
+ extensions::ModuleSystem* module_system = context->module_system(); |
+ extensions::Feature::Context context_type = context->context_type(); |
+ |
// TODO(kalman, fsamuel): Eagerly calling Require on context startup is |
// expensive. It would be better if there were a light way of detecting when |
// a webview or appview is created and only then set up the infrastructure. |
@@ -277,6 +278,8 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules( |
module_system->Require("windowControls"); |
} |
+ const extensions::Extension* extension = context->extension(); |
+ |
// We used to limit WebView to |BLESSED_EXTENSION_CONTEXT| within platform |
// apps. An ext/app runs in a blessed extension context, if it is the active |
// extension in the current process, in other words, if it is loaded in a top |