Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: chrome/browser/media/router/presentation_service_delegate_impl.cc

Issue 1245213002: [MediaRouter] Implement send binary message from PSDImpl to MRPManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated UT to verify the |data| Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/media/router/presentation_service_delegate_impl.h" 5 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/containers/scoped_ptr_hash_map.h" 9 #include "base/containers/scoped_ptr_hash_map.h"
10 #include "base/containers/small_map.h" 10 #include "base/containers/small_map.h"
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 } 629 }
630 630
631 router_->ListenForRouteMessages(route_ids, message_cb); 631 router_->ListenForRouteMessages(route_ids, message_cb);
632 } 632 }
633 633
634 void PresentationServiceDelegateImpl::SendMessage( 634 void PresentationServiceDelegateImpl::SendMessage(
635 int render_process_id, 635 int render_process_id,
636 int render_frame_id, 636 int render_frame_id,
637 scoped_ptr<content::PresentationSessionMessage> message_request, 637 scoped_ptr<content::PresentationSessionMessage> message_request,
638 const SendMessageCallback& send_message_cb) { 638 const SendMessageCallback& send_message_cb) {
639 if (message_request->is_binary()) {
640 NOTIMPLEMENTED();
641 send_message_cb.Run(false);
642 return;
643 }
644 const MediaRoute::Id& route_id = frame_manager_->GetRouteId( 639 const MediaRoute::Id& route_id = frame_manager_->GetRouteId(
645 RenderFrameHostId(render_process_id, render_frame_id), 640 RenderFrameHostId(render_process_id, render_frame_id),
646 message_request->presentation_id); 641 message_request->presentation_id);
647 if (route_id.empty()) { 642 if (route_id.empty()) {
648 DVLOG(1) << "No active route for " << message_request->presentation_id; 643 DVLOG(1) << "No active route for " << message_request->presentation_id;
649 send_message_cb.Run(false); 644 send_message_cb.Run(false);
650 return; 645 return;
651 } 646 }
652 router_->SendRouteMessage(route_id, *(message_request->message), 647
653 send_message_cb); 648 if (message_request->is_binary()) {
649 router_->SendRouteBinaryMessage(route_id, message_request->data.Pass(),
650 send_message_cb);
651 } else {
652 router_->SendRouteMessage(route_id, *(message_request->message),
653 send_message_cb);
654 }
654 } 655 }
655 656
656 void PresentationServiceDelegateImpl::ListenForSessionStateChange( 657 void PresentationServiceDelegateImpl::ListenForSessionStateChange(
657 int render_process_id, 658 int render_process_id,
658 int render_frame_id, 659 int render_frame_id,
659 const content::SessionStateChangedCallback& state_changed_cb) { 660 const content::SessionStateChangedCallback& state_changed_cb) {
660 frame_manager_->ListenForSessionStateChange( 661 frame_manager_->ListenForSessionStateChange(
661 RenderFrameHostId(render_process_id, render_frame_id), state_changed_cb); 662 RenderFrameHostId(render_process_id, render_frame_id), state_changed_cb);
662 } 663 }
663 664
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest( 708 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
708 int render_process_id, 709 int render_process_id,
709 int render_frame_id, 710 int render_frame_id,
710 const MediaSource::Id& source_id) const { 711 const MediaSource::Id& source_id) const {
711 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id); 712 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
712 return frame_manager_->HasScreenAvailabilityListenerForTest( 713 return frame_manager_->HasScreenAvailabilityListenerForTest(
713 render_frame_host_id, source_id); 714 render_frame_host_id, source_id);
714 } 715 }
715 716
716 } // namespace media_router 717 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/mock_media_router.h ('k') | chrome/browser/media/router/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698