chrome/browser/extensions/api/declarative_content/content_action.cc - Issue 796453003: Introduce DeclarativeUserScriptManager.

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/api/declarative_content/content_action.cc

Issue 796453003: Introduce DeclarativeUserScriptManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move back to extensions namespace. Created 6 years 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 | « no previous file | chrome/browser/extensions/declarative_user_script_manager.h » ('j') | chrome/browser/extensions/declarative_user_script_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/content_action.cc

diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc

index 4e535b77225b1748cca0212a7f4227796d64262e..e0ff006e16d05bc8418a6014f331bb6300debe48 100644

--- a/chrome/browser/extensions/api/declarative_content/content_action.cc

+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc

@@ -11,6 +11,7 @@

#include "base/values.h"

#include "chrome/browser/extensions/api/declarative_content/content_constants.h"

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

+#include "chrome/browser/extensions/declarative_user_script_manager.h"

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

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

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

@@ -351,9 +352,9 @@ RequestContentScript::RequestContentScript(

const ScriptData& script_data) {

InitScript(extension, script_data);

- master_ =

- ExtensionSystem::Get(browser_context)->

- GetDeclarativeUserScriptMasterByExtension(extension->id());

+ master_ = ExtensionSystem::Get(browser_context)

+ ->declarative_user_script_manager()

+ ->GetDeclarativeUserScriptMasterByID(extension->id());

AddScript();

}

« no previous file with comments | « no previous file | chrome/browser/extensions/declarative_user_script_manager.h » ('j') | chrome/browser/extensions/declarative_user_script_manager.h » ('J')