extensions/renderer/extension_injection_host.cc - Issue 1293673002: Create thread-safe RendererExtensionRegistry from ExtensionSet

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/renderer/extension_injection_host.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

« no previous file with comments | « extensions/renderer/extension_injection_host.h ('k') | extensions/renderer/renderer_extension_registry.h » ('j') | extensions/renderer/renderer_extension_registry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/extension_injection_host.cc

diff --git a/extensions/renderer/extension_injection_host.cc b/extensions/renderer/extension_injection_host.cc

index 16b0831b6e2f4bd72537678c6d324fd450ff0ced..32e83991f32824fc86a4092e816fbf597fe1709a 100644

--- a/extensions/renderer/extension_injection_host.cc

+++ b/extensions/renderer/extension_injection_host.cc

@@ -6,8 +6,8 @@

#include "content/public/renderer/render_frame.h"

#include "extensions/common/constants.h"

-#include "extensions/common/extension_set.h"

#include "extensions/common/manifest_handlers/csp_info.h"

+#include "extensions/renderer/renderer_extension_registry.h"

#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"

#include "third_party/WebKit/public/web/WebLocalFrame.h"

@@ -24,9 +24,9 @@ ExtensionInjectionHost::~ExtensionInjectionHost() {

// static

scoped_ptr<const InjectionHost> ExtensionInjectionHost::Create(

- const std::string& extension_id,

- const ExtensionSet* extensions) {

- const Extension* extension = extensions->GetByID(extension_id);

+ const std::string& extension_id) {

+ const Extension* extension =

+ RendererExtensionRegistry::Get()->GetByID(extension_id);

if (!extension)

return scoped_ptr<const ExtensionInjectionHost>();

return scoped_ptr<const ExtensionInjectionHost>(