| 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,
|
|
|