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

Unified Diff: chrome/browser/extensions/api/execute_code_function.cc

Issue 22875046: Don't serialize extension user script injection results unless the extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sensible v8::Context-ness Created 7 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/execute_code_function.cc
diff --git a/chrome/browser/extensions/api/execute_code_function.cc b/chrome/browser/extensions/api/execute_code_function.cc
index 52c70e6065ce23e9a5ab39472bf19b482f80cc83..96bfb9da97d5293af035e973fe4eddc9ea53e651 100644
--- a/chrome/browser/extensions/api/execute_code_function.cc
+++ b/chrome/browser/extensions/api/execute_code_function.cc
@@ -127,7 +127,10 @@ bool ExecuteCodeFunction::Execute(const std::string& code_string) {
frame_scope,
run_at,
ScriptExecutor::ISOLATED_WORLD,
- IsWebView(),
+ IsWebView() ? ScriptExecutor::WEB_VIEW_PROCESS
+ : ScriptExecutor::DEFAULT_PROCESS,
+ has_callback() ? ScriptExecutor::JSON_SERIALIZED_RESULT
+ : ScriptExecutor::NO_RESULT,
base::Bind(&ExecuteCodeFunction::OnExecuteCodeFinished, this));
return true;
}
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698