Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/metrics/user_metrics_action.h" | 10 #include "base/metrics/user_metrics_action.h" |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 272 Send(reply); | 272 Send(reply); |
| 273 } | 273 } |
| 274 // Don't continue looking for someone to handle it. | 274 // Don't continue looking for someone to handle it. |
| 275 return true; | 275 return true; |
| 276 } | 276 } |
| 277 } | 277 } |
| 278 | 278 |
| 279 if (delegate_->OnMessageReceived(this, msg)) | 279 if (delegate_->OnMessageReceived(this, msg)) |
| 280 return true; | 280 return true; |
| 281 | 281 |
| 282 if (cross_process_frame_connector_ && | 282 RenderFrameProxyHost* proxy = |
| 283 cross_process_frame_connector_->OnMessageReceived(msg)) | 283 frame_tree_node_->render_manager()->ProxyToParent(); |
|
kenrb
2014/06/06 15:45:54
I think this is the problem. This message intercep
| |
| 284 if (proxy && proxy->cross_process_frame_connector() && | |
| 285 proxy->cross_process_frame_connector()->OnMessageReceived(msg)) | |
| 284 return true; | 286 return true; |
| 285 | 287 |
| 286 bool handled = true; | 288 bool handled = true; |
| 287 IPC_BEGIN_MESSAGE_MAP(RenderFrameHostImpl, msg) | 289 IPC_BEGIN_MESSAGE_MAP(RenderFrameHostImpl, msg) |
| 288 IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole) | 290 IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole) |
| 289 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) | 291 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) |
| 290 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused) | 292 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused) |
| 291 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame, | 293 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame, |
| 292 OnDidStartProvisionalLoadForFrame) | 294 OnDidStartProvisionalLoadForFrame) |
| 293 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError, | 295 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError, |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 890 cancel_notification_callbacks_.erase(notification_id); | 892 cancel_notification_callbacks_.erase(notification_id); |
| 891 } | 893 } |
| 892 | 894 |
| 893 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( | 895 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( |
| 894 int callback_context) { | 896 int callback_context) { |
| 895 Send(new DesktopNotificationMsg_PermissionRequestDone( | 897 Send(new DesktopNotificationMsg_PermissionRequestDone( |
| 896 routing_id_, callback_context)); | 898 routing_id_, callback_context)); |
| 897 } | 899 } |
| 898 | 900 |
| 899 } // namespace content | 901 } // namespace content |
| OLD | NEW |