summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 18:17:23 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 18:17:23 +0000
commit363680faae60b8ec1f6a57d3c701935a6f046fb6 (patch)
tree4530c2be35fbe1dfe384ffe03e8775993fa8f4fb /chrome_frame/external_tab.cc
parent1693996df25b186a4523e9148fd8a5fe0405ccde (diff)
downloadchromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.zip
chromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.tar.gz
chromium_src-363680faae60b8ec1f6a57d3c701935a6f046fb6.tar.bz2
Refactor automation messages.
automation_messages used to live in chrome/test/automation, when it's needed by browser and chrome_frame. When I started lifting code out of headers and into implementation files, I was getting link errors and temporarily solved the problem by compiling the cc files manually into libbrowser.a. Now this is part of chrome/common/ which is included by all targets needed. While doing this, discover that automation IPC redefines the ContextMenuParams struct. Rename it to MiniContextMenuParams. BUG=51409 TEST=none Review URL: http://codereview.chromium.org/4200007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab.cc')
-rw-r--r--chrome_frame/external_tab.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 4bfeff2..edc1ad9 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -7,7 +7,7 @@
#include "base/tracked.h"
#include "base/task.h"
#include "base/waitable_event.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "chrome_frame/utils.h"
DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
@@ -271,8 +271,10 @@ void ExternalTabProxy::HandleAccelerator(const MSG& accel_message) {
&UIDelegate::OnHandleAccelerator, accel_message));
}
-void ExternalTabProxy::HandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params) {
+void ExternalTabProxy::HandleContextMenu(
+ HANDLE menu_handle,
+ int align_flags,
+ const IPC::MiniContextMenuParams& params) {
ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
&UIDelegate::OnHandleContextMenu, menu_handle, align_flags, params));
}