chrome/renderer/content_settings_observer.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: chrome/renderer/content_settings_observer.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: chrome/renderer/content_settings_observer.cc

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc

index ff5dc98c80315f6d8d736c80e1075326c63524fa..1df38817a78f805993976020d17d4db32f62725a 100644

--- a/chrome/renderer/content_settings_observer.cc

+++ b/chrome/renderer/content_settings_observer.cc

@@ -27,6 +27,7 @@

#include "extensions/common/permissions/api_permission.h"

#include "extensions/common/permissions/permissions_data.h"

#include "extensions/renderer/dispatcher.h"

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

#endif

using blink::WebContentSettingCallbacks;

@@ -677,7 +678,8 @@ const extensions::Extension* ContentSettingsObserver::GetExtension(

if (!extension_dispatcher_->IsExtensionActive(extension_id))

return NULL;

- return extension_dispatcher_->extensions()->GetByID(extension_id);

+ return extensions::RendererExtensionRegistry::GetRegistry()->GetByID(

+ extension_id);

}

#endif

« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/extensions/app_bindings.cc » ('j') | extensions/renderer/dispatcher.cc » ('J')