diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 22:51:15 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 22:51:15 +0000 |
| commit | d480ae50cfc537495257f6437680ead7acb080ba (patch) | |
| tree | 7c16aeef59d09fa149676b3f26ccf9df16cea3ac /chrome_frame/chrome_frame_delegate.cc | |
| parent | a1ced36bfe270857f9e73c19338817be40d86720 (diff) | |
| download | chromium_src-d480ae50cfc537495257f6437680ead7acb080ba.zip chromium_src-d480ae50cfc537495257f6437680ead7acb080ba.tar.gz chromium_src-d480ae50cfc537495257f6437680ead7acb080ba.tar.bz2 | |
Add arguments in macros where required
This was breaking a variant of the current macro, so I defined
a no-op for the "code" values.
r=slightlyoff
BUG=103830
Review URL: http://codereview.chromium.org/8511083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_delegate.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_delegate.cc | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/chrome_frame/chrome_frame_delegate.cc b/chrome_frame/chrome_frame_delegate.cc index aba97d1..cd586b6 100644 --- a/chrome_frame/chrome_frame_delegate.cc +++ b/chrome_frame/chrome_frame_delegate.cc @@ -6,36 +6,42 @@ #include "chrome/common/automation_messages.h" +#define NO_CODE ((void)0) + bool ChromeFrameDelegateImpl::IsTabMessage(const IPC::Message& message) { bool is_tab_message = true; IPC_BEGIN_MESSAGE_MAP(ChromeFrameDelegateImpl, message) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_NavigationStateChanged, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_UpdateTargetUrl, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_HandleAccelerator, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_TabbedOut, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_OpenURL, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_NavigationFailed, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_DidNavigate, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_TabLoaded, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_MoveWindow, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_ForwardMessageToExternalHost, ) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_NavigationStateChanged, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_UpdateTargetUrl, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_HandleAccelerator, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_TabbedOut, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_OpenURL, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_NavigationFailed, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_DidNavigate, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_TabLoaded, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_MoveWindow, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC( + AutomationMsg_ForwardMessageToExternalHost, NO_CODE) IPC_MESSAGE_HANDLER_GENERIC( - AutomationMsg_ForwardContextMenuToExternalHost, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestStart, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestRead, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestEnd, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_DownloadRequestInHost, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_SetCookieAsync, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_AttachExternalTab, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestGoToHistoryEntryOffset, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_GetCookiesFromHost, ) - IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_CloseExternalTab, ) + AutomationMsg_ForwardContextMenuToExternalHost, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestStart, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestRead, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestEnd, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_DownloadRequestInHost, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_SetCookieAsync, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_AttachExternalTab, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC( + AutomationMsg_RequestGoToHistoryEntryOffset, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_GetCookiesFromHost, NO_CODE) + IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_CloseExternalTab, NO_CODE) IPC_MESSAGE_UNHANDLED(is_tab_message = false); IPC_END_MESSAGE_MAP() return is_tab_message; } +#undef NO_CODE + bool ChromeFrameDelegateImpl::OnMessageReceived(const IPC::Message& msg) { if (!IsValid()) { DLOG(WARNING) << __FUNCTION__ |