summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/cfproxy.h6
-rw-r--r--chrome_frame/cfproxy_proxy.cc2
-rw-r--r--chrome_frame/cfproxy_support.cc2
-rw-r--r--chrome_frame/cfproxy_test.cc6
-rw-r--r--chrome_frame/chrome_active_document.cc3
-rw-r--r--chrome_frame/chrome_active_document.h3
-rw-r--r--chrome_frame/chrome_frame_activex_base.h4
-rw-r--r--chrome_frame/chrome_frame_delegate.h4
-rw-r--r--chrome_frame/chrome_frame_npapi.cc2
-rw-r--r--chrome_frame/chrome_frame_npapi.h3
-rw-r--r--chrome_frame/chrome_frame_plugin.h4
-rw-r--r--chrome_frame/external_tab.cc8
-rw-r--r--chrome_frame/external_tab.h10
-rw-r--r--chrome_frame/external_tab_test.cc4
-rw-r--r--chrome_frame/plugin_url_request.cc2
-rw-r--r--chrome_frame/test/automation_client_mock.h2
-rw-r--r--chrome_frame/test/net/test_automation_provider.cc2
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc2
18 files changed, 36 insertions, 33 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.
diff --git a/chrome_frame/cfproxy_proxy.cc b/chrome_frame/cfproxy_proxy.cc
index e03cb0e..15f40ff 100644
--- a/chrome_frame/cfproxy_proxy.cc
+++ b/chrome_frame/cfproxy_proxy.cc
@@ -6,7 +6,7 @@
#include "base/tuple.h"
#include "ipc/ipc_sync_message.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
CFProxy::CFProxy(CFProxyTraits* api) : ipc_thread_("ipc"),
sync_dispatcher_(&tab2delegate_),
diff --git a/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc
index 42e6a28..162d039 100644
--- a/chrome_frame/cfproxy_support.cc
+++ b/chrome_frame/cfproxy_support.cc
@@ -8,8 +8,8 @@
#include "base/atomic_sequence_num.h"
#include "base/command_line.h"
#include "base/process_util.h"
+#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/test/automation/automation_messages.h"
#include "chrome_frame/chrome_launcher_utils.h"
#include "chrome_frame/utils.h" // for IsHeadlessMode();
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc
index 28ba8c6..a8c69f3 100644
--- a/chrome_frame/cfproxy_test.cc
+++ b/chrome_frame/cfproxy_test.cc
@@ -5,8 +5,8 @@
#include <string>
#include "base/file_path.h"
#include "base/waitable_event.h"
+#include "chrome/common/automation_messages.h"
#include "chrome_frame/cfproxy_private.h"
-#include "chrome/test/automation/automation_messages.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gmock_mutant.h"
@@ -73,7 +73,7 @@ struct MockChromeProxyDelegate : public ChromeProxyDelegate {
// Misc. UI.
MOCK_METHOD1(HandleAccelerator, void(const MSG& accel_message));
MOCK_METHOD3(HandleContextMenu, void(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params));
+ const IPC::MiniContextMenuParams& params));
MOCK_METHOD1(TabbedOut, void(bool reverse));
//
@@ -472,7 +472,7 @@ TEST(Deserialize, DispatchTabMessage) {
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m9));
// Tuple4<int, HANDLE, int, IPC::ContextMenuParams>
- IPC::ContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"),
+ IPC::MiniContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"),
GURL("http://unfiltered_link_url"), GURL("http://src_url"),
GURL("http://page_url"), GURL("http://frame_url") };
AutomationMsg_ForwardContextMenuToExternalHost m10(0, 1, HANDLE(7), 4,
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());
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 482a672..5723e7ff 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -344,7 +344,8 @@ END_EXEC_COMMAND_MAP()
// Callbacks from ChromeFramePlugin<T>
bool PreProcessContextMenu(HMENU menu);
- bool HandleContextMenuCommand(UINT cmd, const IPC::ContextMenuParams& params);
+ bool HandleContextMenuCommand(UINT cmd,
+ const IPC::MiniContextMenuParams& params);
// ChromeFramePlugin overrides.
virtual void OnAutomationServerReady();
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);
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h
index b57cc5b..c7890b7 100644
--- a/chrome_frame/chrome_frame_delegate.h
+++ b/chrome_frame/chrome_frame_delegate.h
@@ -13,7 +13,7 @@
#include "base/file_path.h"
#include "base/lock.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "ipc/ipc_message.h"
// A common interface supported by all the browser specific ChromeFrame
@@ -108,7 +108,7 @@ class ChromeFrameDelegateImpl : public ChromeFrameDelegate {
const std::string& target) {}
virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
int align_flags,
- const IPC::ContextMenuParams& params) {}
+ const IPC::MiniContextMenuParams& params) {}
virtual void OnRequestStart(int tab_handle, int request_id,
const IPC::AutomationURLRequest& request) {}
virtual void OnRequestRead(int tab_handle, int request_id,
diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc
index 9ea07df..5668a5b 100644
--- a/chrome_frame/chrome_frame_npapi.cc
+++ b/chrome_frame/chrome_frame_npapi.cc
@@ -1476,7 +1476,7 @@ bool ChromeFrameNPAPI::PreProcessContextMenu(HMENU menu) {
}
bool ChromeFrameNPAPI::HandleContextMenuCommand(UINT cmd,
- const IPC::ContextMenuParams& params) {
+ const IPC::MiniContextMenuParams& params) {
if (cmd == IDC_ABOUT_CHROME_FRAME) {
// TODO: implement "About Chrome Frame"
}
diff --git a/chrome_frame/chrome_frame_npapi.h b/chrome_frame/chrome_frame_npapi.h
index 5101592..d606090 100644
--- a/chrome_frame/chrome_frame_npapi.h
+++ b/chrome_frame/chrome_frame_npapi.h
@@ -128,7 +128,8 @@ END_MSG_MAP()
static void InitializeIdentifiers();
bool PreProcessContextMenu(HMENU menu);
- bool HandleContextMenuCommand(UINT cmd, const IPC::ContextMenuParams& params);
+ bool HandleContextMenuCommand(UINT cmd,
+ const IPC::MiniContextMenuParams& params);
protected:
// Handler for accelerator messages passed on from the hosted chrome
// instance.
diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index 9ea6ce9..58a76a6 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -120,7 +120,7 @@ END_MSG_MAP()
virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
int align_flags,
- const IPC::ContextMenuParams& params) {
+ const IPC::MiniContextMenuParams& params) {
if (!menu_handle || !automation_client_.get()) {
NOTREACHED();
return;
@@ -219,7 +219,7 @@ END_MSG_MAP()
// Return true if menu command is processed, otherwise the command will be
// passed to Chrome for execution. Override in most-derived class if needed.
bool HandleContextMenuCommand(UINT cmd,
- const IPC::ContextMenuParams& params) {
+ const IPC::MiniContextMenuParams& params) {
return false;
}
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 4bfeff2..edc1ad9 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -7,7 +7,7 @@
#include "base/tracked.h"
#include "base/task.h"
#include "base/waitable_event.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "chrome_frame/utils.h"
DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
@@ -271,8 +271,10 @@ void ExternalTabProxy::HandleAccelerator(const MSG& accel_message) {
&UIDelegate::OnHandleAccelerator, accel_message));
}
-void ExternalTabProxy::HandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params) {
+void ExternalTabProxy::HandleContextMenu(
+ HANDLE menu_handle,
+ int align_flags,
+ const IPC::MiniContextMenuParams& params) {
ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
&UIDelegate::OnHandleContextMenu, menu_handle, align_flags, params));
}
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
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc
index 0e49f95..1448c34 100644
--- a/chrome_frame/external_tab_test.cc
+++ b/chrome_frame/external_tab_test.cc
@@ -9,7 +9,7 @@
// #include "base/waitable_event.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gmock_mutant.h"
@@ -41,7 +41,7 @@ struct MockUIDelegate : public UIDelegate {
MOCK_METHOD3(OnMessageFromChromeFrame, void(const std::string& message,
const std::string& origin, const std::string& target));
MOCK_METHOD3(OnHandleContextMenu, void(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params));
+ const IPC::MiniContextMenuParams& params));
MOCK_METHOD1(OnHandleAccelerator, void(const MSG& accel_message));
MOCK_METHOD1(OnTabbedOut, void(bool reverse));
MOCK_METHOD1(OnGoToHistoryOffset, void(int offset));
diff --git a/chrome_frame/plugin_url_request.cc b/chrome_frame/plugin_url_request.cc
index c4bf932..236090b 100644
--- a/chrome_frame/plugin_url_request.cc
+++ b/chrome_frame/plugin_url_request.cc
@@ -4,7 +4,7 @@
#include "chrome_frame/plugin_url_request.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "chrome_frame/np_browser_functions.h"
PluginUrlRequest::PluginUrlRequest()
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 2ac30e8..58928b8 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -51,7 +51,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
const std::string& origin,
const std::string& target));
MOCK_METHOD4(OnHandleContextMenu, void(int tab_handle, HANDLE menu_handle,
- int align_flags, const IPC::ContextMenuParams& params));
+ int align_flags, const IPC::MiniContextMenuParams& params));
MOCK_METHOD3(OnRequestStart, void(int tab_handle, int request_id,
const IPC::AutomationURLRequest& request));
MOCK_METHOD3(OnRequestRead, void(int tab_handle, int request_id,
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index 7594f30..5b8a9a6 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -7,7 +7,7 @@
#include "base/command_line.h"
#include "base/file_version_info.h"
#include "base/path_service.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
#include "chrome_frame/test/net/test_automation_resource_message_filter.h"
namespace {
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 482e00e..4116464 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -37,6 +37,7 @@
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/pref_value_store.h"
+#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.h"
@@ -46,7 +47,6 @@
#include "chrome/common/pref_names.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/ie_event_sink.h"
-#include "chrome/test/automation/automation_messages.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
generated by cgit v1.1 at 2025-01-17 19:44:57 +0000