Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Unified Diff: chrome/renderer/extensions/user_script_scheduler.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/extensions/tab_finder.cc ('k') | chrome/renderer/extensions/user_script_slave.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/user_script_scheduler.cc
diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc
index dad8cb9936dc191a96a27937b161f8143609d0fb..dc4ebee15bf2b939a9892debcf591338745c86f6 100644
--- a/chrome/renderer/extensions/user_script_scheduler.cc
+++ b/chrome/renderer/extensions/user_script_scheduler.cc
@@ -133,6 +133,7 @@ void UserScriptScheduler::ExecuteCodeImpl(
params.extension_id);
content::RenderView* render_view =
content::RenderView::FromWebView(frame_->view());
+ ExtensionHelper* extension_helper = ExtensionHelper::Get(render_view);
// Since extension info is sent separately from user script info, they can
// be out of sync. We just ignore this situation.
@@ -162,7 +163,9 @@ void UserScriptScheduler::ExecuteCodeImpl(
// For child frames, we just skip ones the extension doesn't have access
// to and carry on.
if (!extension->CanExecuteScriptOnPage(frame->document().url(),
- NULL, NULL)) {
+ extension_helper->tab_id(),
+ NULL,
+ NULL)) {
if (frame->parent()) {
continue;
} else {
« no previous file with comments | « chrome/renderer/extensions/tab_finder.cc ('k') | chrome/renderer/extensions/user_script_slave.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698