Chromium Code Reviews| Index: content/browser/tab_contents/tab_contents.cc |
| diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc |
| index fd84d52269e46fcb6c3ce231441186059c69411c..11796fe6e599f76e54db6ad24def1bf4e7747dbf 100644 |
| --- a/content/browser/tab_contents/tab_contents.cc |
| +++ b/content/browser/tab_contents/tab_contents.cc |
| @@ -278,6 +278,8 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) { |
| bool handled = true; |
| bool message_is_ok = true; |
| IPC_BEGIN_MESSAGE_MAP_EX(TabContents, message, message_is_ok) |
| + IPC_MESSAGE_HANDLER(IntentsHostMsg_RegisterIntentHandler, |
| + OnRegisterIntentHandler) |
|
James Hawkins
2011/10/28 22:25:37
These no longer match the implementation order.
Greg Billock
2011/10/28 23:55:21
Yeah. The impl matched header order. The organizat
|
| IPC_MESSAGE_HANDLER(IntentsHostMsg_WebIntentDispatch, |
| OnWebIntentDispatch) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame, |
| @@ -305,8 +307,6 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) { |
| IPC_MESSAGE_HANDLER(ViewHostMsg_JSOutOfMemory, OnJSOutOfMemory) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_RegisterProtocolHandler, |
| OnRegisterProtocolHandler) |
| - IPC_MESSAGE_HANDLER(ViewHostMsg_RegisterIntentHandler, |
| - OnRegisterIntentHandler) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_Find_Reply, OnFindReply) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_AppCacheAccessed, OnAppCacheAccessed) |
| @@ -1119,8 +1119,10 @@ void TabContents::OnRegisterProtocolHandler(const std::string& protocol, |
| void TabContents::OnRegisterIntentHandler(const string16& action, |
| const string16& type, |
| const string16& href, |
| - const string16& title) { |
| - delegate()->RegisterIntentHandler(this, action, type, href, title); |
| + const string16& title, |
| + const string16& disposition) { |
| + delegate()->RegisterIntentHandler( |
| + this, action, type, href, title, disposition); |
| } |
| void TabContents::OnWebIntentDispatch(const IPC::Message& message, |
| @@ -2006,4 +2008,3 @@ bool TabContents::GotResponseToLockMouseRequest(bool allowed) { |
| return render_view_host() ? |
| render_view_host()->GotResponseToLockMouseRequest(allowed) : false; |
| } |
| - |