chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h - 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_rules_registry.h

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_rule.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.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_rules_registry.h

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h

index cb01240b30ca5e19dc4231de3ee222c450393c0a..f630abb0b7eafcdd8321b24559ff04c17b16acca 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h

@@ -14,7 +14,7 @@

#include "base/memory/linked_ptr.h"

#include "base/memory/ref_counted.h"

#include "chrome/browser/extensions/api/declarative/rules_registry_with_cache.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_rule.h"

#include "chrome/browser/extensions/extension_info_map.h"

#include "chrome/common/extensions/matcher/url_matcher.h"

@@ -69,17 +69,14 @@ class WebRequestRulesRegistry : public RulesRegistryWithCache {

// TODO(battre): This will become an implementation detail, because we need

// a way to also execute the actions of the rules.

std::set<WebRequestRule::GlobalRuleId> GetMatches(

- net::URLRequest* request,

- RequestStages request_stage);

+ const WebRequestRule::RequestData& request_data);

// Returns which modifications should be executed on the network request

// according to the rules registered in this registry.

std::list<LinkedPtrEventResponseDelta> CreateDeltas(

const ExtensionInfoMap* extension_info_map,

- net::URLRequest* request,

- bool crosses_incognito,

- RequestStages request_stage,

- const WebRequestRule::OptionalRequestData& optional_request_data);

+ const WebRequestRule::RequestData& request_data,

+ bool crosses_incognito);

// Implementation of RulesRegistryWithCache:

virtual std::string AddRulesImpl(