chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc - Issue 425653002: content: ResourceType cleanup.

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 425653002: content: ResourceType cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 5 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') | no next file with comments »
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 a0218d3984a409e126499a07ad4f7b1df02b9f8a..1d88a42542d769dd9087531dcb968408e073c4eb 100644

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

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

@@ -125,7 +125,7 @@ WebRequestConditionAttribute::Create(

WebRequestConditionAttributeResourceType::

WebRequestConditionAttributeResourceType(

- const std::vector<ResourceType::Type>& types)

+ const std::vector<ResourceType>& types)

: types_(types) {}

WebRequestConditionAttributeResourceType::

@@ -148,11 +148,11 @@ WebRequestConditionAttributeResourceType::Create(

size_t number_types = value_as_list->GetSize();

- std::vector<ResourceType::Type> passed_types;

+ std::vector<ResourceType> passed_types;

passed_types.reserve(number_types);

for (size_t i = 0; i < number_types; ++i) {

std::string resource_type_string;

- ResourceType::Type type = ResourceType::LAST_TYPE;

+ ResourceType type = content::RESOURCE_TYPE_LAST_TYPE;

if (!value_as_list->GetString(i, &resource_type_string) ||

!helpers::ParseResourceType(resource_type_string, &type)) {

*error = ErrorUtils::FormatErrorMessage(kInvalidValue,