diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
| commit | 47af65f00a6d9606b6d31a09e4562d59a83f2598 (patch) | |
| tree | 486879c031214c2126dd750c8638c4d745198a84 /chrome/test/automation | |
| parent | e027da19eb4b219f44a19ffae90c33e77ed06a34 (diff) | |
| download | chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.zip chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.gz chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.bz2 | |
Reapply part of r64637, which caused mysterious failures on mac waterfall.
This applies only the rename of IPC::ContextMenuParams to
IPC::MiniContextMenuParams so that it doesn't conflict with ::ContextMenuParams
(defined in webkit). This is about half the original patch.
BUG=51409
TEST=compiles
Review URL: http://codereview.chromium.org/4669005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/automation_messages.h | 6 | ||||
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h index bb6d866..afaa87f 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/test/automation/automation_messages.h @@ -520,7 +520,7 @@ struct ParamTraits<NavigationInfo> { }; // A stripped down version of ContextMenuParams in webkit/glue/context_menu.h. -struct ContextMenuParams { +struct MiniContextMenuParams { // The x coordinate for displaying the menu. int screen_x; @@ -550,8 +550,8 @@ struct ContextMenuParams { // Traits for ContextMenuParams structure to pack/unpack. template <> -struct ParamTraits<ContextMenuParams> { - typedef ContextMenuParams param_type; +struct ParamTraits<MiniContextMenuParams> { + typedef MiniContextMenuParams param_type; static void Write(Message* m, const param_type& p) { WriteParam(m, p.screen_x); WriteParam(m, p.screen_y); diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index d421859..487d53c 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -953,7 +953,7 @@ IPC_BEGIN_MESSAGES(Automation) int /* tab_handle */, HANDLE /* source menu handle */, int /* align flags */, - IPC::ContextMenuParams /* params */) + IPC::MiniContextMenuParams /* params */) IPC_MESSAGE_ROUTED2(AutomationMsg_ForwardContextMenuCommandToChrome, int /* tab_handle */, |