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

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

Issue 764643002: Remove WebViewKey in rules registry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 e764669af5d1338a43d7b82fd4a70b301f0141c7..03a55c78e570ae2ce78b62d9fe7a43832b0288fb 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
@@ -14,6 +14,7 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_messages.h"
@@ -29,7 +30,7 @@ ChromeContentRulesRegistry::ChromeContentRulesRegistry(
declarative_content_constants::kOnPageChanged,
content::BrowserThread::UI,
cache_delegate,
- WebViewKey(0, 0)) {
+ RulesRegistryService::kDefultRulesRegistryID) {
extension_info_map_ = ExtensionSystem::Get(browser_context)->info_map();
registrar_.Add(this,
@@ -166,13 +167,9 @@ std::string ChromeContentRulesRegistry::AddRulesImpl(
DCHECK(content_rules_.find(rule_id) == content_rules_.end());
scoped_ptr<ContentRule> content_rule(
- ContentRule::Create(url_matcher_.condition_factory(),
- browser_context(),
- extension,
- extension_installation_time,
- *rule,
- ContentRule::ConsistencyChecker(),
- &error));
+ ContentRule::Create(url_matcher_.condition_factory(), browser_context(),
+ extension, extension_installation_time, *rule,
+ ContentRule::ConsistencyChecker(), &error));
if (!error.empty()) {
// Clean up temporary condition sets created during rule creation.
url_matcher_.ClearUnusedConditionSets();

Powered by Google App Engine
This is Rietveld 408576698