| 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 ee3f5be7f08559010e2745c2ef5c4613c99db5af..44d03f23a7c0ef934529dfa809de11f73d17e9f0 100644
|
| --- a/chrome/browser/extensions/execute_code_in_tab_function.cc
|
| +++ b/chrome/browser/extensions/execute_code_in_tab_function.cc
|
| @@ -36,8 +36,7 @@ ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
|
| run_at_(UserScript::DOCUMENT_IDLE) {
|
| }
|
|
|
| -ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {
|
| -}
|
| +ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {}
|
|
|
| bool ExecuteCodeInTabFunction::RunImpl() {
|
| DictionaryValue* script_info;
|
| @@ -142,6 +141,41 @@ bool ExecuteCodeInTabFunction::RunImpl() {
|
| return true;
|
| }
|
|
|
| +bool ExecuteCodeInTabFunction::OnMessageReceived(const IPC::Message& message) {
|
| + if (message.type() != ExtensionHostMsg_ExecuteCodeFinished::ID)
|
| + return false;
|
| +
|
| + int message_request_id;
|
| + PickleIterator iter(message);
|
| + if (!message.ReadInt(&iter, &message_request_id)) {
|
| + NOTREACHED() << "malformed extension message";
|
| + return true;
|
| + }
|
| +
|
| + if (message_request_id != request_id())
|
| + return false;
|
| +
|
| + IPC_BEGIN_MESSAGE_MAP(ExecuteCodeInTabFunction, message)
|
| + IPC_MESSAGE_HANDLER(ExtensionHostMsg_ExecuteCodeFinished,
|
| + OnExecuteCodeFinished)
|
| + IPC_END_MESSAGE_MAP()
|
| + return true;
|
| +}
|
| +
|
| +void ExecuteCodeInTabFunction::OnExecuteCodeFinished(int request_id,
|
| + bool success,
|
| + const std::string& error) {
|
| + if (!error.empty()) {
|
| + CHECK(!success);
|
| + error_ = error;
|
| + }
|
| +
|
| + SendResponse(success);
|
| +
|
| + Observe(NULL);
|
| + Release(); // balanced in Execute()
|
| +}
|
| +
|
| void ExecuteCodeInTabFunction::DidLoadFile(bool success,
|
| const std::string& data) {
|
| std::string function_name = name();
|
| @@ -250,38 +284,3 @@ bool ExecuteCodeInTabFunction::Execute(const std::string& code_string) {
|
| AddRef(); // balanced in OnExecuteCodeFinished()
|
| return true;
|
| }
|
| -
|
| -bool ExecuteCodeInTabFunction::OnMessageReceived(const IPC::Message& message) {
|
| - if (message.type() != ExtensionHostMsg_ExecuteCodeFinished::ID)
|
| - return false;
|
| -
|
| - int message_request_id;
|
| - PickleIterator iter(message);
|
| - if (!message.ReadInt(&iter, &message_request_id)) {
|
| - NOTREACHED() << "malformed extension message";
|
| - return true;
|
| - }
|
| -
|
| - if (message_request_id != request_id())
|
| - return false;
|
| -
|
| - IPC_BEGIN_MESSAGE_MAP(ExecuteCodeInTabFunction, message)
|
| - IPC_MESSAGE_HANDLER(ExtensionHostMsg_ExecuteCodeFinished,
|
| - OnExecuteCodeFinished)
|
| - IPC_END_MESSAGE_MAP()
|
| - return true;
|
| -}
|
| -
|
| -void ExecuteCodeInTabFunction::OnExecuteCodeFinished(int request_id,
|
| - bool success,
|
| - const std::string& error) {
|
| - if (!error.empty()) {
|
| - CHECK(!success);
|
| - error_ = error;
|
| - }
|
| -
|
| - SendResponse(success);
|
| -
|
| - Observe(NULL);
|
| - Release(); // balanced in Execute()
|
| -}
|
|
|