chrome/renderer/extensions/user_script_slave.cc - Issue 10443105: Take 2 at implementing activeTab.

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/renderer/extensions/user_script_slave.cc

Issue 10443105: Take 2 at implementing activeTab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: empty -> is_empty Created 8 years, 6 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:

Index: chrome/renderer/extensions/user_script_slave.cc

diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc

index 8862631a2c47999dce84d3bfa23ce8a16df30db2..9ddaf4d89c3e5502ce05f760f84775e1bea6bbd8 100644

--- a/chrome/renderer/extensions/user_script_slave.cc

+++ b/chrome/renderer/extensions/user_script_slave.cc

@@ -279,8 +279,14 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,

if (!extension)

continue;

- if (!extension->CanExecuteScriptOnPage(data_source_url, script, NULL))

+ // Content scripts are not tab-specific.

+ int kNoTabId = -1;

+ if (!extension->CanExecuteScriptOnPage(data_source_url,

+ kNoTabId,

+ script,

+ NULL)) {

continue;

+ }

// We rely on WebCore for CSS injection, but it's still useful to know how

// many css files there are.