| Index: chrome/browser/extensions/tab_helper.cc
|
| diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
|
| index 1e13b38c782dc681954fb079654de702a6abc4c4..5ef5691813d6bdfa3c8386f502b73ddca9df6396 100644
|
| --- a/chrome/browser/extensions/tab_helper.cc
|
| +++ b/chrome/browser/extensions/tab_helper.cc
|
| @@ -5,11 +5,14 @@
|
| #include "chrome/browser/extensions/tab_helper.h"
|
|
|
| #include "chrome/browser/extensions/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/app_notify_channel_ui.h"
|
| #include "chrome/browser/extensions/crx_installer.h"
|
| #include "chrome/browser/extensions/extension_action.h"
|
| #include "chrome/browser/extensions/extension_action_manager.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| +#include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| #include "chrome/browser/extensions/page_action_controller.h"
|
| #include "chrome/browser/extensions/script_badge_controller.h"
|
| @@ -83,7 +86,11 @@ TabHelper::TabHelper(content::WebContents* web_contents)
|
| this)),
|
| pending_web_app_action_(NONE),
|
| script_executor_(new ScriptExecutor(web_contents,
|
| - &script_execution_observers_)) {
|
| + &script_execution_observers_)),
|
| + content_rules_registry_(
|
| + ExtensionSystem::Get(
|
| + Profile::FromBrowserContext(web_contents->GetBrowserContext()))->
|
| + rules_registry_service()->content_rules_registry()) {
|
| // The ActiveTabPermissionManager requires a session ID; ensure this
|
| // WebContents has one.
|
| SessionTabHelper::CreateForWebContents(web_contents);
|
| @@ -185,6 +192,9 @@ void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
|
| void TabHelper::DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| const content::FrameNavigateParams& params) {
|
| + content_rules_registry_->DidNavigateMainFrame(
|
| + web_contents(), details, params);
|
| +
|
| if (details.is_in_page)
|
| return;
|
|
|
| @@ -226,6 +236,8 @@ bool TabHelper::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
|
| IPC_MESSAGE_HANDLER(ExtensionHostMsg_ContentScriptsExecuting,
|
| OnContentScriptsExecuting)
|
| + IPC_MESSAGE_HANDLER(ExtensionHostMsg_OnWatchedPageChange,
|
| + OnWatchedPageChange)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -415,6 +427,11 @@ void TabHelper::OnContentScriptsExecuting(
|
| on_url));
|
| }
|
|
|
| +void TabHelper::OnWatchedPageChange(
|
| + const std::vector<std::string>& css_selectors) {
|
| + content_rules_registry_->Apply(web_contents(), css_selectors);
|
| +}
|
| +
|
| const Extension* TabHelper::GetExtension(const std::string& extension_app_id) {
|
| if (extension_app_id.empty())
|
| return NULL;
|
|
|