extensions/browser/api/web_request/web_request_api.cc - Issue 1865303006: Map webRequest filter type to multiple internal ResourceTypes if needed

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/web_request/web_request_api.cc

Issue 1865303006: Map webRequest filter type to multiple internal ResourceTypes if needed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: 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

« no previous file with comments | « extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc ('k') | extensions/browser/api/web_request/web_request_api_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/web_request/web_request_api.cc

diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc

index aa799bbe459cf3a32a24607a19e377baddbd6a46..11801806233b5a3db4360175226a75f690bd78f4 100644

--- a/extensions/browser/api/web_request/web_request_api.cc

+++ b/extensions/browser/api/web_request/web_request_api.cc

@@ -527,12 +527,10 @@ bool ExtensionWebRequestEventRouter::RequestFilter::InitFromValue(

return false;

for (size_t i = 0; i < types_value->GetSize(); ++i) {

std::string type_str;

- content::ResourceType type;

if (!types_value->GetString(i, &type_str) ||

- !helpers::ParseResourceType(type_str, &type)) {

+ !helpers::ParseResourceType(type_str, &types)) {

return false;

}

- types.push_back(type);

}

} else if (it.key() == "tabId") {

if (!it.value().GetAsInteger(&tab_id))