extensions/renderer/script_context.cc - Issue 1880933002: Begin to enable extension APIs in Extension Service Worker.

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/script_context.cc

Issue 1880933002: Begin to enable extension APIs in Extension Service Worker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments -> round 1 Created 4 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

« extensions/renderer/request_sender.cc ('K') | « extensions/renderer/resources/runtime_custom_bindings.js ('k') | extensions/renderer/service_worker_data.h » ('j') | extensions/renderer/service_worker_request_sender.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/script_context.cc

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

index 6a5b631179035859e3b0e53ea7a4cbaef968cac0..892d7019078e3dc6d143bf35bad4d4228112d8b3 100644

--- a/extensions/renderer/script_context.cc

+++ b/extensions/renderer/script_context.cc

@@ -255,8 +255,12 @@ std::string ScriptContext::GetEffectiveContextTypeDescription() const {

bool ScriptContext::IsAnyFeatureAvailableToContext(const Feature& api) {

DCHECK(thread_checker_.CalledOnValidThread());

+ // TODO(lazyboy): Decide what we should do for SERVICE_WORKER_CONTEXT.

+ GURL url = context_type() == Feature::SERVICE_WORKER_CONTEXT

+ ? url_

+ : GetDataSourceURLForFrame(web_frame());

return ExtensionAPI::GetSharedInstance()->IsAnyFeatureAvailableToContext(

- api, extension(), context_type(), GetDataSourceURLForFrame(web_frame()));

+ api, extension(), context_type(), url);

}

// static