extensions/browser/api/declarative/declarative_rule.h - Issue 550403003: Move declarative api files to extensions/browser/api/declarative.

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: extensions/browser/api/declarative/declarative_rule.h

Issue 550403003: Move declarative api files to extensions/browser/api/declarative. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix browser tests. Created 6 years, 3 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 | « extensions/browser/api/declarative/declarative_api.cc ('k') | extensions/browser/api/declarative/declarative_rule_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative/declarative_rule.h

diff --git a/chrome/browser/extensions/api/declarative/declarative_rule.h b/extensions/browser/api/declarative/declarative_rule.h

similarity index 98%

rename from chrome/browser/extensions/api/declarative/declarative_rule.h

rename to extensions/browser/api/declarative/declarative_rule.h

index 3d286f060a6fd44b28182fdffb2b5e374b112093..b612f271d6407864c99400abb174e6b551bf8971 100644

--- a/chrome/browser/extensions/api/declarative/declarative_rule.h

+++ b/extensions/browser/api/declarative/declarative_rule.h

@@ -7,8 +7,8 @@

// templated on the Condition and Action types that define the behavior of a

// particular declarative event.

-#ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_DECLARATIVE_RULE_H__

-#define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_DECLARATIVE_RULE_H__

+#ifndef EXTENSIONS_BROWSER_API_DECLARATIVE_DECLARATIVE_RULE_H__

+#define EXTENSIONS_BROWSER_API_DECLARATIVE_DECLARATIVE_RULE_H__

#include <limits>

#include <set>

@@ -20,8 +20,8 @@

#include "base/memory/scoped_vector.h"

#include "base/stl_util.h"

#include "base/time/time.h"

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

#include "components/url_matcher/url_matcher.h"

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

#include "extensions/common/extension.h"

namespace base {

@@ -203,7 +203,7 @@ class DeclarativeRule {

typedef int Priority;

typedef DeclarativeConditionSet<ConditionT> ConditionSet;

typedef DeclarativeActionSet<ActionT> ActionSet;

- typedef extensions::api::events::Rule JsonRule;

+ typedef extensions::core_api::events::Rule JsonRule;

typedef std::vector<std::string> Tags;

// Checks whether the set of |conditions| and |actions| are consistent.

@@ -514,4 +514,4 @@ int DeclarativeRule<ConditionT, ActionT>::GetMinimumPriority() const {

} // namespace extensions

-#endif // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_DECLARATIVE_RULE_H__

+#endif // EXTENSIONS_BROWSER_API_DECLARATIVE_DECLARATIVE_RULE_H__