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

Unified Diff: extensions/renderer/script_injection_manager.cc

Issue 1293673002: Create thread-safe RendererExtensionRegistry from ExtensionSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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: extensions/renderer/script_injection_manager.cc
diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc
index 8c5206319ecafa7ad2756c7b0847a3b5d33cb440..895e25a92ebc5d967db784f49596881e711a09f8 100644
--- a/extensions/renderer/script_injection_manager.cc
+++ b/extensions/renderer/script_injection_manager.cc
@@ -17,6 +17,7 @@
#include "extensions/renderer/extension_frame_helper.h"
#include "extensions/renderer/extension_injection_host.h"
#include "extensions/renderer/programmatic_script_injector.h"
+#include "extensions/renderer/renderer_extension_registry.h"
#include "extensions/renderer/script_injection.h"
#include "extensions/renderer/scripts_run_info.h"
#include "extensions/renderer/web_ui_injection_host.h"
@@ -215,10 +216,8 @@ void ScriptInjectionManager::RFOHelper::InvalidateAndResetFrame() {
}
ScriptInjectionManager::ScriptInjectionManager(
- const ExtensionSet* extensions,
UserScriptSetManager* user_script_set_manager)
- : extensions_(extensions),
- user_script_set_manager_(user_script_set_manager),
+ : user_script_set_manager_(user_script_set_manager),
user_script_set_manager_observer_(this) {
user_script_set_manager_observer_.Add(user_script_set_manager_);
}
@@ -401,8 +400,7 @@ void ScriptInjectionManager::HandleExecuteCode(
content::RenderFrame* render_frame) {
scoped_ptr<const InjectionHost> injection_host;
if (params.host_id.type() == HostID::EXTENSIONS) {
- injection_host = ExtensionInjectionHost::Create(params.host_id.id(),
- extensions_);
+ injection_host = ExtensionInjectionHost::Create(params.host_id.id());
if (!injection_host)
return;
} else if (params.host_id.type() == HostID::WEBUI) {

Powered by Google App Engine
This is Rietveld 408576698