chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc - Issue 10831150: Refactor request parameters into RequestData struct. Also make RequestStage singular.

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

Issue 10831150: Refactor request parameters into RequestData struct. Also make RequestStage singular. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: ; Created 8 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 | « chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc » ('j') | chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 426a7e38a6f45fa1552d9b6aa39723cd6a52e45b..d79eb3b89af386e34bf50449fbc8a348c62e514f 100644

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

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

@@ -9,7 +9,7 @@

#include "base/logging.h"

#include "base/stringprintf.h"

#include "base/values.h"

-#include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"

+#include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"

#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"

#include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"

#include "content/public/browser/resource_request_info.h"

@@ -114,12 +114,11 @@ int WebRequestConditionAttributeResourceType::GetStages() const {

}

bool WebRequestConditionAttributeResourceType::IsFulfilled(

- net::URLRequest* request,

- RequestStages request_stage) {

- if (!(request_stage & GetStages()))

+ const WebRequestRule::RequestData& request_data) {

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

return false;

const content::ResourceRequestInfo* info =

- content::ResourceRequestInfo::ForRequest(request);

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

if (!info)

return false;

return std::find(types_.begin(), types_.end(), info->GetResourceType()) !=