| Index: chrome/browser/extensions/script_executor.cc
|
| diff --git a/chrome/browser/extensions/script_executor.cc b/chrome/browser/extensions/script_executor.cc
|
| index 9e4aecdcc2cf660a1757262ab5ae9494cfddcb04..41ffd49eaaf0142583d8bb6ca47d449c50f8409a 100644
|
| --- a/chrome/browser/extensions/script_executor.cc
|
| +++ b/chrome/browser/extensions/script_executor.cc
|
| @@ -115,7 +115,8 @@ void ScriptExecutor::ExecuteScript(
|
| ScriptExecutor::FrameScope frame_scope,
|
| UserScript::RunLocation run_at,
|
| ScriptExecutor::WorldType world_type,
|
| - bool is_web_view,
|
| + ScriptExecutor::ProcessType process_type,
|
| + ScriptExecutor::ResultType result_type,
|
| const ExecuteScriptCallback& callback) {
|
| ExtensionMsg_ExecuteCode_Params params;
|
| params.request_id = next_request_id_++;
|
| @@ -125,7 +126,8 @@ void ScriptExecutor::ExecuteScript(
|
| params.all_frames = (frame_scope == ALL_FRAMES);
|
| params.run_at = static_cast<int>(run_at);
|
| params.in_main_world = (world_type == MAIN_WORLD);
|
| - params.is_web_view = is_web_view;
|
| + params.is_web_view = (process_type == WEB_VIEW_PROCESS);
|
| + params.wants_result = (result_type == JSON_SERIALIZED_RESULT);
|
|
|
| // Handler handles IPCs and deletes itself on completion.
|
| new Handler(script_observers_, web_contents_, params, callback);
|
|
|