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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 1182083006: Call EnsureWebKitInitialized() before registering extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround for tests Created 5 years, 5 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 | « content/renderer/render_thread_impl.cc ('k') | 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 4351b22cc2bff7341a700543ea31b98dc910c69f..4d6dd9729e31d0b93e8d01cdece068664d021d16 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -199,8 +199,6 @@ Dispatcher::Dispatcher(DispatcherDelegate* delegate)
kInitialExtensionIdleHandlerDelayMs);
}
- RenderThread::Get()->RegisterExtension(SafeBuiltins::CreateV8Extension());
not at google - send to devlin 2015/07/10 16:26:11 Put this behind an |is_webkit_initialized_| flag?
bashi 2015/07/14 00:00:24 That won't install SafeBuiltins because |is_webkit
not at google - send to devlin 2015/07/14 23:31:54 Oh, right.
-
script_context_set_.reset(
new ScriptContextSet(&extensions_, &active_extension_ids_));
user_script_set_manager_.reset(new UserScriptSetManager(&extensions_));
@@ -744,6 +742,8 @@ bool Dispatcher::OnControlMessageReceived(const IPC::Message& message) {
}
void Dispatcher::WebKitInitialized() {
+ RenderThread::Get()->RegisterExtension(SafeBuiltins::CreateV8Extension());
+
// For extensions, we want to ensure we call the IdleHandler every so often,
// even if the extension keeps up activity.
if (set_idle_notifications_) {
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698