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

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

Issue 1202963004: Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 659
660 void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) { 660 void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) {
661 const MediaSource& source = route.media_source(); 661 const MediaSource& source = route.media_source();
662 DCHECK(!source.Empty()); 662 DCHECK(!source.Empty());
663 if (!default_source_.Equals(source)) 663 if (!default_source_.Equals(source))
664 return; 664 return;
665 RenderFrameHost* main_frame = web_contents_->GetMainFrame(); 665 RenderFrameHost* main_frame = web_contents_->GetMainFrame();
666 if (!main_frame) 666 if (!main_frame)
667 return; 667 return;
668 RenderFrameHostId render_frame_host_id(GetRenderFrameHostId(main_frame)); 668 RenderFrameHostId render_frame_host_id(GetRenderFrameHostId(main_frame));
669 // TODO(imcheng): Pass in valid default presentation ID once it is 669 std::string presentation_id =
670 // available from MediaRoute URN. BUG=493365 670 GetPresentationIdAndUrl(route.media_route_id()).first;
671 std::string presentation_id;
672 frame_manager_->OnPresentationSessionStarted( 671 frame_manager_->OnPresentationSessionStarted(
673 render_frame_host_id, true, 672 render_frame_host_id, true,
674 content::PresentationSessionInfo(PresentationUrlFromMediaSource(source), 673 content::PresentationSessionInfo(PresentationUrlFromMediaSource(source),
675 presentation_id), 674 presentation_id),
676 route.media_route_id()); 675 route.media_route_id());
677 } 676 }
678 677
679 void PresentationServiceDelegateImpl::AddDefaultMediaSourceObserver( 678 void PresentationServiceDelegateImpl::AddDefaultMediaSourceObserver(
680 DefaultMediaSourceObserver* observer) { 679 DefaultMediaSourceObserver* observer) {
681 default_media_source_observers_.AddObserver(observer); 680 default_media_source_observers_.AddObserver(observer);
(...skipping 18 matching lines...) Expand all
700 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest( 699 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
701 int render_process_id, 700 int render_process_id,
702 int render_frame_id, 701 int render_frame_id,
703 const MediaSource::Id& source_id) const { 702 const MediaSource::Id& source_id) const {
704 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id); 703 RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
705 return frame_manager_->HasScreenAvailabilityListenerForTest( 704 return frame_manager_->HasScreenAvailabilityListenerForTest(
706 render_frame_host_id, source_id); 705 render_frame_host_id, source_id);
707 } 706 }
708 707
709 } // namespace media_router 708 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | content/browser/presentation/presentation_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698