chrome/browser/extensions/user_script_loader.cc - Issue 493633003: Browser changes for wiring up RequestContentScript API to shared memory

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/user_script_loader.cc

Issue 493633003: Browser changes for wiring up RequestContentScript API to shared memory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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/test_extension_system.h ('K') | « chrome/browser/extensions/test_extension_system.h ('k') | chrome/browser/extensions/user_script_loader_unittest.cc » ('j') | chrome/browser/extensions/user_script_loader_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/user_script_loader.cc

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

index a25f9d25b583659a58731115660082498fb8c91e..6bf7b5448c57506b8d69fa70be198f9a5102fde6 100644

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

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

@@ -347,7 +347,6 @@ UserScriptLoader::UserScriptLoader(Profile* profile,

const ExtensionId& owner_extension_id,

bool listen_for_extension_system_loaded)

: user_scripts_(new UserScriptList()),

- clear_scripts_(false),

Devlin 2014/08/21 17:14:09 probably wanna init this still. ;)

Mark Dittmer 2014/08/21 21:25:12 Done.

extension_system_ready_(false),

pending_load_(false),

profile_(profile),

@@ -570,7 +569,7 @@ void UserScriptLoader::SendUpdate(

if (base::SharedMemory::IsHandleValid(handle_for_process)) {

process->Send(new ExtensionMsg_UpdateUserScripts(

- handle_for_process, "" /* owner */, changed_extensions));

+ handle_for_process, owner_extension_id_, changed_extensions));

}