| Index: content/renderer/dom_automation_controller.h
|
| diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h
|
| index 0f6a74a30cb0aaff200227a9035861d082efbc3d..ff0b519d0f7d2180b51450ca7f2c61696c72f485 100644
|
| --- a/content/renderer/dom_automation_controller.h
|
| +++ b/content/renderer/dom_automation_controller.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_
|
| #define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_
|
|
|
| +#include "content/renderer/cpp_bound_class.h"
|
| #include "ipc/ipc_sender.h"
|
| -#include "webkit/renderer/cpp_bound_class.h"
|
|
|
| /* DomAutomationController class:
|
| Bound to Javascript window.domAutomationController object.
|
| @@ -75,7 +75,7 @@ namespace content {
|
| // TODO(vibhor): Add another method-pair like sendLater() and sendNow()
|
| // sendLater() should keep building a json serializer
|
| // sendNow() should send the above serializer as a string.
|
| -class DomAutomationController : public webkit_glue::CppBoundClass {
|
| +class DomAutomationController : public CppBoundClass {
|
| public:
|
| DomAutomationController();
|
|
|
| @@ -84,14 +84,12 @@ class DomAutomationController : public webkit_glue::CppBoundClass {
|
| // Number (double casted to int32) or boolean.
|
| // The function returns true/false based on the result of actual send over
|
| // IPC. It sets the return value to null on unexpected errors or arguments.
|
| - void Send(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void Send(const CppArgumentList& args, CppVariant* result);
|
|
|
| // Makes the renderer send a javascript value to the app.
|
| // The value must be a NPString and should be properly formed JSON.
|
| // This function does not modify/escape the returned string in any way.
|
| - void SendJSON(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void SendJSON(const CppArgumentList& args, CppVariant* result);
|
|
|
| // Sends a string with a provided Automation Id.
|
| // Expects two javascript values; the first must be a number type and will be
|
| @@ -99,11 +97,9 @@ class DomAutomationController : public webkit_glue::CppBoundClass {
|
| // The function returns true/false to the javascript based on the success
|
| // of the send over IPC. It sets the javascript return value to null on
|
| // unexpected errors or arguments.
|
| - void SendWithId(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void SendWithId(const CppArgumentList& args, CppVariant* result);
|
|
|
| - void SetAutomationId(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void SetAutomationId(const CppArgumentList& args, CppVariant* result);
|
|
|
| // TODO(vibhor): Implement later
|
| // static CppBindingObjectMethod sendLater;
|
|
|