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

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

Issue 254473011: Introduce chrome.shell.createWindow stub API for app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps (shell-api) Created 6 years, 8 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
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index cd5f4433d0608d885e397b9fb60787c86fa605a3..59311fdfdd2f3d4f895d8a33320abfc437aeaa97 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -72,6 +72,7 @@
#include "extensions/renderer/document_custom_bindings.h"
#include "extensions/renderer/event_bindings.h"
#include "extensions/renderer/extension_groups.h"
+#include "extensions/renderer/extensions_renderer_client.h"
#include "extensions/renderer/file_system_natives.h"
#include "extensions/renderer/i18n_custom_bindings.h"
#include "extensions/renderer/id_generator_custom_bindings.h"
@@ -475,6 +476,8 @@ Dispatcher::Dispatcher()
user_script_slave_.reset(new UserScriptSlave(&extensions_));
request_sender_.reset(new RequestSender(this));
PopulateSourceMap();
+ // Register JS sources from the extensions module embedder.
+ ExtensionsRendererClient::Get()->PopulateSourceMap(&source_map_);
PopulateLazyBindingsMap();
}
@@ -1161,8 +1164,13 @@ void Dispatcher::DidCreateScriptContext(
ModuleSystem::NativesEnabledScope natives_enabled_scope(
module_system);
+ // Register the core extensions native handlers.
RegisterNativeHandlers(module_system, context);
+ // Register native handlers from the extensions embedder.
+ ExtensionsRendererClient::Get()->RegisterNativeHandlers(module_system,
+ context);
+
module_system->RegisterNativeHandler("chrome",
scoped_ptr<NativeHandler>(new ChromeNativeHandler(context)));
module_system->RegisterNativeHandler("print",

Powered by Google App Engine
This is Rietveld 408576698