extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc - Issue 2449913002: Support WebSocket in WebRequest API.

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/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

Issue 2449913002: Support WebSocket in WebRequest API. (Closed)

Patch Set: Fix unittest; add 'websocket' type to WebRequest API. Created 3 years, 10 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

« chrome/test/data/extensions/api_test/webrequest/test_websocket.js ('K') | « chrome/test/data/extensions/api_test/webrequest/test_websocket.js ('k') | extensions/browser/api/web_request/resource_type_ext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

index 4bb2b3b12ef7f6b4adca7ae917b2cd12a81e8fb7..18048aa95b7994839b2a58d34c964ccba62dd071 100644

--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

@@ -181,6 +181,11 @@ bool WebRequestConditionAttributeResourceType::IsFulfilled(

if (!(request_data.stage & GetStages()))

return false;

+ if (request_data.request->url().SchemeIsWSOrWSS()) {

+ return std::find(types_.begin(), types_.end(), ResourceTypeExt(true)) !=

+ types_.end();

+ }

const content::ResourceRequestInfo* info =

content::ResourceRequestInfo::ForRequest(request_data.request);

return info &&