chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc - Issue 63933003: Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/

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_action.cc

Issue 63933003: Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comment fix Created 7 years, 1 month 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_action.h ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4da726e9fbeaacc64465763d5d9a0d1233155b44..14c2c8e22af09e72a5f176028a350b60f8e7b83c 100644

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

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

@@ -17,9 +17,9 @@

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

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

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

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

#include "chrome/common/extensions/extension.h"

#include "content/public/common/url_constants.h"

+#include "extensions/browser/info_map.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "net/url_request/url_request.h"

#include "third_party/re2/re2/re2.h"

@@ -436,7 +436,7 @@ bool WebRequestAction::Equals(const WebRequestAction* other) const {

return type() == other->type();

}

-bool WebRequestAction::HasPermission(const ExtensionInfoMap* extension_info_map,

+bool WebRequestAction::HasPermission(const InfoMap* extension_info_map,

const std::string& extension_id,

const net::URLRequest* request,

bool crosses_incognito) const {