summaryrefslogtreecommitdiffstats
path: root/chrome_frame/cfproxy.h
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/cfproxy.h
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/cfproxy.h')
-rw-r--r--chrome_frame/cfproxy.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h
index bfcc998..c414df7 100644
--- a/chrome_frame/cfproxy.h
+++ b/chrome_frame/cfproxy.h
@@ -13,8 +13,8 @@
#include "base/lock.h"
#include "base/time.h" // for base::TimeDelta
#include "base/file_path.h"
+#include "chrome/common/automation_constants.h"
#include "chrome/common/page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
enum FindInPageDirection { BACK = 0, FWD = 1 };
enum FindInPageCase { IGNORE_CASE = 0, CASE_SENSITIVE = 1 };
@@ -34,7 +34,7 @@ namespace IPC {
struct NavigationInfo;
struct AutomationURLRequest;
struct AttachExternalTabParams;
- struct ContextMenuParams;
+ struct MiniContextMenuParams;
};
class GURL;
@@ -196,7 +196,7 @@ class ChromeProxyDelegate {
// Misc. UI.
virtual void HandleAccelerator(const MSG& accel_message) = 0;
virtual void HandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params) = 0;
+ const IPC::MiniContextMenuParams& params) = 0;
virtual void TabbedOut(bool reverse) = 0;
// Tab related.