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

Unified Diff: chrome/browser/extensions/api/declarative/initializing_rules_registry.h

Issue 9422003: Migrate Declarative API bindings to new JSON objects generated by JSON compiler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and fixed some stuff Created 8 years, 10 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/initializing_rules_registry.h
diff --git a/chrome/browser/extensions/api/declarative/initializing_rules_registry.h b/chrome/browser/extensions/api/declarative/initializing_rules_registry.h
index b91c266f2ffaa51d67b0bbfa9773caea273031a5..790727f8a2adaa8220e40c7a31fb8a039a3f510e 100644
--- a/chrome/browser/extensions/api/declarative/initializing_rules_registry.h
+++ b/chrome/browser/extensions/api/declarative/initializing_rules_registry.h
@@ -26,7 +26,7 @@ class InitializingRulesRegistry : public RulesRegistry {
// Implementation for RulesRegistry:
virtual std::string AddRules(
const std::string& extension_id,
- const std::vector<base::DictionaryValue*>& rules) OVERRIDE;
+ const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE;
virtual std::string RemoveRules(
const std::string& extension_id,
const std::vector<std::string>& rule_identifiers) OVERRIDE;
@@ -35,11 +35,12 @@ class InitializingRulesRegistry : public RulesRegistry {
virtual std::string GetRules(
const std::string& extension_id,
const std::vector<std::string>& rule_identifiers,
- std::vector<base::DictionaryValue*>* out) OVERRIDE;
+ std::vector<linked_ptr<RulesRegistry::Rule> >* out) OVERRIDE;
virtual std::string GetAllRules(
const std::string& extension_id,
- std::vector<base::DictionaryValue*>* out) OVERRIDE;
+ std::vector<linked_ptr<RulesRegistry::Rule> >* out) OVERRIDE;
virtual void OnExtensionUnloaded(const std::string& extension_id) OVERRIDE;
+ virtual content::BrowserThread::ID GetOwnerThread() OVERRIDE;
private:
// Returns whether any existing rule is registered with identifier |rule_id|
@@ -55,11 +56,11 @@ class InitializingRulesRegistry : public RulesRegistry {
// returns a non-empty error message.
std::string CheckAndFillInOptionalRules(
const std::string& extension_id,
- const std::vector<base::DictionaryValue*>& rules);
+ const std::vector<linked_ptr<RulesRegistry::Rule> >& rules);
// Initializes the priority fields in case they have not been set.
void FillInOptionalPriorities(
- const std::vector<base::DictionaryValue*>& rules);
+ const std::vector<linked_ptr<RulesRegistry::Rule> >& rules);
// Removes all |identifiers| of |extension_id| from |used_rule_identifiers_|.
void RemoveUsedRuleIdentifiers(const std::string& extension_id,

Powered by Google App Engine
This is Rietveld 408576698