chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h - Issue 370833002: Move resource_type.* from webkit/ to content/.

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.h

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos fix 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/chromeos/login/signin/merge_session_throttle.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc » ('j') | content/public/common/resource_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f4c8f75e6bda5fd0a0646bafc72e7434b790f402..d8e80281a8ad820e0202d587190fe8e133459c8b 100644

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

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

@@ -13,7 +13,7 @@

#include "base/memory/scoped_ptr.h"

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

#include "chrome/common/extensions/api/events.h"

-#include "webkit/common/resource_type.h"

+#include "content/public/common/resource_type.h"

namespace base {

class Value;

@@ -105,10 +105,10 @@ class WebRequestConditionAttributeResourceType

private:

explicit WebRequestConditionAttributeResourceType(

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

+ const std::vector<content::ResourceType::Type>& types);

virtual ~WebRequestConditionAttributeResourceType();

- const std::vector<ResourceType::Type> types_;

+ const std::vector<content::ResourceType::Type> types_;

DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeResourceType);

};