Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1175)

Unified Diff: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc

Issue 1226353004: Generate all extension schema namespaces as "api" and instead vary the generated bundle names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
Index: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
index e51878d931d9145c826775b98ac0870fc00f4fc0..e9bda2e6e59578f80dd21cf3c7daa80ad0c1e986 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -175,7 +175,7 @@ ChromeContentRulesRegistry::ContentRule::~ContentRule() {}
scoped_ptr<const ChromeContentRulesRegistry::ContentRule>
ChromeContentRulesRegistry::CreateRule(const Extension* extension,
- const core_api::events::Rule& api_rule,
+ const api::events::Rule& api_rule,
std::string* error) {
ScopedVector<const ContentCondition> conditions;
for (const linked_ptr<base::Value>& value : api_rule.conditions) {
@@ -260,7 +260,7 @@ ChromeContentRulesRegistry::GetMatches(
std::string ChromeContentRulesRegistry::AddRulesImpl(
const std::string& extension_id,
- const std::vector<linked_ptr<core_api::events::Rule>>& rules) {
+ const std::vector<linked_ptr<api::events::Rule>>& rules) {
EvaluationScope evaluation_scope(this);
const Extension* extension = ExtensionRegistry::Get(browser_context())
->GetInstalledExtension(extension_id);
@@ -269,7 +269,7 @@ std::string ChromeContentRulesRegistry::AddRulesImpl(
std::string error;
RulesMap new_content_rules;
- for (const linked_ptr<core_api::events::Rule>& rule : rules) {
+ for (const linked_ptr<api::events::Rule>& rule : rules) {
ExtensionRuleIdPair rule_id(extension, *rule->id);
DCHECK(content_rules_.find(rule_id) == content_rules_.end());

Powered by Google App Engine
This is Rietveld 408576698