diff options
author | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 03:17:15 +0000 |
---|---|---|
committer | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 03:17:15 +0000 |
commit | 1ac38a9e6242f8f0c988ac134c7be56eb5e68664 (patch) | |
tree | 0c11bfe505b5895cd5fd9444ebff3effed2ca0b9 /chrome/browser/automation | |
parent | 1952ead62fe3413ce990e8b0d3440b8f49a68922 (diff) | |
download | chromium_src-1ac38a9e6242f8f0c988ac134c7be56eb5e68664.zip chromium_src-1ac38a9e6242f8f0c988ac134c7be56eb5e68664.tar.gz chromium_src-1ac38a9e6242f8f0c988ac134c7be56eb5e68664.tar.bz2 |
Propagate a change made to a base class virtual method.
rev 47972 made a modification to a virtual method signature but the derived class in these file wasn't updated. Now it is...
And I also did a few lint fixes.
BUG=0
TEST=Testing alone isn't enough, sometimes a code search is safer!
Review URL: http://codereview.chromium.org/2200002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r-- | chrome/browser/automation/automation_extension_function.cc | 6 | ||||
-rw-r--r-- | chrome/browser/automation/automation_extension_function.h | 5 |
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(); |