chrome/browser/extensions/api/web_request/web_request_api.cc - Issue 11572061: Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates

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

Issue 11572061: Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to Vaclav's CL and fix Dominic's comments Created 8 years 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/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc ('K') | « chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3b764b6d82165b51ad03b8089701e54ff52060a1..6f12567e2f8251d5ec7e86e265dc1e3648dd1af0 100644

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

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

@@ -18,7 +18,6 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_content_browser_client.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/api/declarative_webrequest/webrequest_rules_registry.h"

#include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"

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

@@ -1553,7 +1552,7 @@ bool ExtensionWebRequestEventRouter::ProcessDeclarativeRules(

helpers::EventResponseDeltas result =

rules_registry->CreateDeltas(

extension_info_map,

- extensions::WebRequestRule::RequestData(

+ extensions::DeclarativeWebRequestData(

request, request_stage, original_response_headers),

i->second);