chrome/browser/extensions/tab_helper.cc - Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService.

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: chrome/browser/extensions/tab_helper.cc

Issue 590573002: Remove ContentRulesRegistry dependence from RulesRegistryService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix comment. 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 | « chrome/browser/extensions/api/declarative_content/content_rules_registry_unittest.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/tab_helper.cc

diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc

index b25e5af0cccfede94d8d75dc51cad32d96ff7177..4b0417d750f803225b013a296bffccb7401ed4ad 100644

--- a/chrome/browser/extensions/tab_helper.cc

+++ b/chrome/browser/extensions/tab_helper.cc

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

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/active_script_controller.h"

#include "chrome/browser/extensions/activity_log/activity_log.h"

-#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"

-#include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"

+#include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h"

#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"

#include "chrome/browser/extensions/api/webstore/webstore_api.h"

#include "chrome/browser/extensions/bookmark_app_helper.h"

@@ -46,6 +45,7 @@

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/frame_navigate_params.h"

+#include "extensions/browser/api/declarative/rules_registry_service.h"

#include "extensions/browser/extension_error.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"