diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 18:17:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 18:17:23 +0000 |
| commit | 363680faae60b8ec1f6a57d3c701935a6f046fb6 (patch) | |
| tree | 4530c2be35fbe1dfe384ffe03e8775993fa8f4fb /chrome_frame/chrome_frame_activex_base.h | |
| parent | 1693996df25b186a4523e9148fd8a5fe0405ccde (diff) | |
| download | chromium_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/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index def29b8..116deb6 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -358,7 +358,7 @@ END_MSG_MAP() } bool HandleContextMenuCommand(UINT cmd, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { if (cmd == IDC_ABOUT_CHROME_FRAME) { int tab_handle = automation_client_->tab()->handle(); HostNavigate(GURL("about:version"), GURL(), NEW_WINDOW); @@ -519,7 +519,7 @@ END_MSG_MAP() virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle, int align_flags, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { scoped_refptr<BasePlugin> ref(this); ChromeFramePlugin<T>::OnHandleContextMenu(tab_handle, menu_handle, align_flags, params); |