chrome/browser/extensions/execute_code_in_tab_function.cc - Issue 10388160: Only return the visible page actions from PageActionController.

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

Issue 10388160: Only return the visible page actions from PageActionController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: actually fix Created 8 years, 7 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/browser/extensions/execute_code_in_tab_function.cc

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

index b2c4e7ac16bc5529ba191446e4f9b2e35102b47c..d50afc670fd03af7ef4799c4972f16f6e38de0c1 100644

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

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

@@ -9,6 +9,7 @@

#include "base/utf_string_conversions.h"

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

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

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

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

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

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

@@ -244,7 +245,7 @@ bool ExecuteCodeInTabFunction::Execute(const std::string& code_string) {

NOTREACHED();

}

- contents->extension_script_executor()->ExecuteScript(

+ contents->extension_tab_helper()->script_executor()->ExecuteScript(

extension->id(),

script_type,

code_string,