diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 20:26:15 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 20:26:15 +0000 |
| commit | 3338bcfceb61b73b46914eae305cec86cea8484e (patch) | |
| tree | 496d70543570b42d5c36b77b0c5156597e6701c0 /content/renderer/dom_automation_controller.h | |
| parent | d86fbbebdddc19e02311a27c8e44ec4119458cd2 (diff) | |
| download | chromium_src-3338bcfceb61b73b46914eae305cec86cea8484e.zip chromium_src-3338bcfceb61b73b46914eae305cec86cea8484e.tar.gz chromium_src-3338bcfceb61b73b46914eae305cec86cea8484e.tar.bz2 | |
Quote CppBoundClass/CppVariant in namespace.
To avoid name conflict when linking DumpRenderTree which has its own implementation of the classes with the same names.
Eventually the related classes will be replaced with V8 API.
BUG=127238
TEST=Build all without error
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/dom_automation_controller.h')
| -rw-r--r-- | content/renderer/dom_automation_controller.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 9dabb79..2049408 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -74,7 +74,7 @@ // 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 CppBoundClass { +class DomAutomationController : public webkit_glue::CppBoundClass { public: DomAutomationController(); @@ -83,12 +83,14 @@ class DomAutomationController : public 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 CppArgumentList& args, CppVariant* result); + void Send(const webkit_glue::CppArgumentList& args, + webkit_glue::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 CppArgumentList& args, CppVariant* result); + void SendJSON(const webkit_glue::CppArgumentList& args, + webkit_glue::CppVariant* result); // Sends a string with a provided Automation Id. // Expects two javascript values; the first must be a number type and will be @@ -96,9 +98,11 @@ class DomAutomationController : public 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 CppArgumentList& args, CppVariant* result); + void SendWithId(const webkit_glue::CppArgumentList& args, + webkit_glue::CppVariant* result); - void SetAutomationId(const CppArgumentList& args, CppVariant* result); + void SetAutomationId(const webkit_glue::CppArgumentList& args, + webkit_glue::CppVariant* result); // TODO(vibhor): Implement later // static CppBindingObjectMethod sendLater; |