From 47af65f00a6d9606b6d31a09e4562d59a83f2598 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Mon, 8 Nov 2010 21:43:55 +0000 Subject: Reapply part of r64637, which caused mysterious failures on mac waterfall. This applies only the rename of IPC::ContextMenuParams to IPC::MiniContextMenuParams so that it doesn't conflict with ::ContextMenuParams (defined in webkit). This is about half the original patch. BUG=51409 TEST=compiles Review URL: http://codereview.chromium.org/4669005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65429 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/cfproxy.h | 4 ++-- chrome_frame/cfproxy_test.cc | 4 ++-- chrome_frame/chrome_active_document.cc | 2 +- chrome_frame/chrome_active_document.h | 3 ++- chrome_frame/chrome_frame_activex_base.h | 4 ++-- chrome_frame/chrome_frame_delegate.h | 2 +- chrome_frame/chrome_frame_npapi.cc | 2 +- chrome_frame/chrome_frame_npapi.h | 3 ++- chrome_frame/chrome_frame_plugin.h | 4 ++-- chrome_frame/external_tab.cc | 6 ++++-- chrome_frame/external_tab.h | 6 +++--- chrome_frame/external_tab_test.cc | 2 +- chrome_frame/test/automation_client_mock.h | 2 +- 13 files changed, 24 insertions(+), 20 deletions(-) (limited to 'chrome_frame') diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h index 513c2c5..dc0e4b0 100644 --- a/chrome_frame/cfproxy.h +++ b/chrome_frame/cfproxy.h @@ -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_test.cc b/chrome_frame/cfproxy_test.cc index 5b2937c..6a547f8 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -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)); // @@ -486,7 +486,7 @@ TEST(Deserialize, DispatchTabMessage) { EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m9)); // Tuple4 - 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 979d9d7..bd82315 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -971,7 +971,7 @@ bool ChromeActiveDocument::PreProcessContextMenu(HMENU menu) { } bool ChromeActiveDocument::HandleContextMenuCommand(UINT cmd, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { ScopedComPtr 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 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 736c690..4504128 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -360,7 +360,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); @@ -521,7 +521,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 ref(this); ChromeFramePlugin::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..d111d38 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -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 211b48d..785f6af 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -273,8 +273,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 cd8551a..5411528 100644 --- a/chrome_frame/external_tab.h +++ b/chrome_frame/external_tab.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, // 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 375e4fb..015ed7b 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -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/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, -- cgit v1.1