chrome/common/extensions/manifest_handlers/content_scripts_handler.cc - Issue 822453002: Introduce HostID and de-couple Extensions from "script injection System" [browser side]

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/common/extensions/manifest_handlers/content_scripts_handler.cc

Issue 822453002: Introduce HostID and de-couple Extensions from "script injection System" [browser side] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Introduce HostID for DeclarativeUserScriptMaser assignment, remove ConsumerID. Created 5 years, 11 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

« chrome/browser/extensions/user_script_loader.cc ('K') | « chrome/chrome_tests_unit.gypi ('k') | extensions/browser/api/declarative/declarative_rule.h » ('j') | extensions/common/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

index 7f7cba97a23f6ed9ec4d224d4045705af49098b8..ec56469e6fd5c2e669373daba3e94684c1c2c2d9 100644

--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

+++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

@@ -16,6 +16,7 @@

#include "extensions/common/error_utils.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_resource.h"

+#include "extensions/common/host_id.h"

#include "extensions/common/manifest_constants.h"

#include "extensions/common/manifest_handlers/permissions_parser.h"

#include "extensions/common/permissions/permissions_data.h"

@@ -419,7 +420,8 @@ bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {

return false; // Failed to parse script context definition.

}

- user_script.set_extension_id(extension->id());

+ HostID id(HostID::EXTENSIONS, extension->id());

+ user_script.set_host_id(id);

Devlin 2015/01/26 20:12:09 nit: inline HostID construction.

Xi Han 2015/01/26 23:27:53 Done.

if (extension->converted_from_user_script()) {

user_script.set_emulate_greasemonkey(true);

// Greasemonkey matches all frames.