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_active_document.cc | |
| 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_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 9dfe739..1f4aa4b 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -31,7 +31,6 @@ #include "base/win/scoped_variant.h" #include "grit/generated_resources.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/navigation_types.h" #include "chrome/common/page_zoom.h" @@ -970,7 +969,7 @@ bool ChromeActiveDocument::PreProcessContextMenu(HMENU menu) { } bool ChromeActiveDocument::HandleContextMenuCommand(UINT cmd, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { ScopedComPtr<IWebBrowser2> web_browser2; DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive()); |