summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_extension_function.cc6
-rw-r--r--chrome/browser/automation/automation_extension_function.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/automation/automation_extension_function.cc b/chrome/browser/automation/automation_extension_function.cc
index 6f3bb73..c58e45cd 100644
--- a/chrome/browser/automation/automation_extension_function.cc
+++ b/chrome/browser/automation/automation_extension_function.cc
@@ -19,7 +19,7 @@ TabContents* AutomationExtensionFunction::api_handler_tab_ = NULL;
AutomationExtensionFunction::PendingFunctionsMap
AutomationExtensionFunction::pending_functions_;
-void AutomationExtensionFunction::SetArgs(const Value* args) {
+void AutomationExtensionFunction::SetArgs(const ListValue* args) {
// Need to JSON-encode for sending over the wire to the automation user.
base::JSONWriter::Write(args, false, &args_);
}
@@ -101,8 +101,8 @@ void AutomationExtensionFunction::Enable(
}
void AutomationExtensionFunction::Disable() {
- api_handler_tab_ = NULL;
- ExtensionFunctionDispatcher::ResetFunctions();
+ api_handler_tab_ = NULL;
+ ExtensionFunctionDispatcher::ResetFunctions();
}
bool AutomationExtensionFunction::InterceptMessageFromExternalHost(
diff --git a/chrome/browser/automation/automation_extension_function.h b/chrome/browser/automation/automation_extension_function.h
index faf125e..5e15e9e 100644
--- a/chrome/browser/automation/automation_extension_function.h
+++ b/chrome/browser/automation/automation_extension_function.h
@@ -7,8 +7,9 @@
#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_EXTENSION_FUNCTION_H_
#define CHROME_BROWSER_AUTOMATION_AUTOMATION_EXTENSION_FUNCTION_H_
-#include <string>
#include <map>
+#include <string>
+#include <vector>
#include "chrome/browser/extensions/extension_function.h"
@@ -22,7 +23,7 @@ class AutomationExtensionFunction : public AsyncExtensionFunction {
AutomationExtensionFunction() { }
// ExtensionFunction implementation.
- virtual void SetArgs(const Value* args);
+ virtual void SetArgs(const ListValue* args);
virtual const std::string GetResult();
virtual bool RunImpl();