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 19:24:33 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 19:24:33 +0000
commitea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a (patch)
tree1c0a736b831d15b4e250c41c471791368ecbef6a /chrome_frame/cfproxy.h
parent8898ec205da3a100d12ff5ddb64eab993de3cf67 (diff)
downloadchromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.zip
chromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.tar.gz
chromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.tar.bz2
Revert "Refactor automation messages." due to mysterious problems on mac.
This reverts commit c1c1fed998ee4d839bfe256150e5e59220ebc0ef (r64637). TBR=nirnimesh@ BUG=51409 TEST=none Review URL: http://codereview.chromium.org/4194007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64644 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 c414df7..bfcc998 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 MiniContextMenuParams;
+ struct ContextMenuParams;
};
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::MiniContextMenuParams& params) = 0;
+ const IPC::ContextMenuParams& params) = 0;
virtual void TabbedOut(bool reverse) = 0;
// Tab related.