Chromium Code Reviews| Index: chrome/browser/media/router/presentation_service_delegate_impl.cc |
| diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc |
| index 07917eabc8c88c2d3c2df41473d02943694e49a5..b9854f3decbcd8e5b974618e8d887d397e01f3f8 100644 |
| --- a/chrome/browser/media/router/presentation_service_delegate_impl.cc |
| +++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc |
| @@ -610,8 +610,17 @@ void PresentationServiceDelegateImpl::ListenForSessionMessages( |
| int render_process_id, |
| int render_frame_id, |
| const PresentationSessionMessageCallback& message_cb) { |
| - // BUG=464205 |
| - NOTIMPLEMENTED(); |
| + const std::vector<MediaRoute::Id>& route_ids = frame_manager_->GetRouteIds( |
| + RenderFrameHostId(render_process_id, render_frame_id)); |
| + if (route_ids.empty()) { |
| + DVLOG(1) << "No media routes found"; |
| + scoped_ptr<ScopedVector<content::PresentationSessionMessage>> empty_list( |
| + new ScopedVector<content::PresentationSessionMessage>()); |
| + message_cb.Run(empty_list.Pass()); |
| + return; |
| + } |
| + |
| + router_->ListenForRouteMessages(route_ids, message_cb); |
| } |
| void PresentationServiceDelegateImpl::SendMessage( |
| @@ -619,8 +628,22 @@ void PresentationServiceDelegateImpl::SendMessage( |
| int render_frame_id, |
| scoped_ptr<content::PresentationSessionMessage> message_request, |
| const SendMessageCallback& send_message_cb) { |
| - // BUG=464205 |
| - NOTIMPLEMENTED(); |
| + if (message_request->is_binary()) { |
| + // TODO(haibinlu): impl binary message sending. |
| + DVLOG(1) << "Binary message is not supported yet."; |
|
Kevin M
2015/06/23 17:50:18
DVLOG is too mild.
Consider using NOTIMPLEMENTED(
haibinlu
2015/06/23 19:59:42
Done.
|
| + send_message_cb.Run(false); |
| + return; |
| + } |
| + const MediaRoute::Id& route_id = frame_manager_->GetRouteId( |
| + RenderFrameHostId(render_process_id, render_frame_id), |
| + message_request->presentation_id); |
| + if (route_id.empty()) { |
| + DVLOG(1) << "No active route for " << message_request->presentation_id; |
| + send_message_cb.Run(false); |
| + return; |
| + } |
| + router_->SendRouteMessage(route_id, *(message_request->message), |
| + send_message_cb); |
| } |
| void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) { |