summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/external_tab.h')
-rw-r--r--chrome_frame/external_tab.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h
index b68a9bf..6f890ed 100644
--- a/chrome_frame/external_tab.h
+++ b/chrome_frame/external_tab.h
@@ -14,8 +14,8 @@
#include "base/scoped_comptr_win.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
-#include "chrome/common//page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/page_zoom.h"
#include "chrome_frame/cfproxy.h"
#include "chrome_frame/task_marshaller.h"
#include "googleurl/src/gurl.h"
@@ -29,7 +29,7 @@ namespace base {
namespace IPC {
struct NavigationInfo;
- struct ContextMenuParams;
+ struct MiniContextMenuParams;
}
// This is the delegate/callback interface that has to be implemented
@@ -45,7 +45,7 @@ class UIDelegate {
virtual void OnMessageFromChromeFrame(const std::string& message,
const std::string& origin, const std::string& target) = 0;
virtual void OnHandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params) = 0;
+ const IPC::MiniContextMenuParams& params) = 0;
virtual void OnHandleAccelerator(const MSG& accel_message) = 0;
virtual void OnTabbedOut(bool reverse) = 0;
virtual void OnGoToHistoryOffset(int offset) = 0;
@@ -165,7 +165,7 @@ class ExternalTabProxy : public CWindowImpl<ExternalTabProxy>,
// Misc. UI.
virtual void HandleAccelerator(const MSG& accel_message);
virtual void HandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params);
+ const IPC::MiniContextMenuParams& params);
virtual void TabbedOut(bool reverse);
// Other