chrome/browser/media/android/router/media_router_dialog_controller_android.cc - Issue 1415103006: Non-Local Join for Media Router and Presentation API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.cc

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Review Fixes 3 * WITH UI Changes Created 5 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/media/android/router/media_router_android.cc ('K') | « chrome/browser/media/android/router/media_router_dialog_controller_android.h ('k') | chrome/browser/media/router/media_router.h » ('j') | chrome/browser/media/router/media_router.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/android/router/media_router_dialog_controller_android.cc

diff --git a/chrome/browser/media/android/router/media_router_dialog_controller_android.cc b/chrome/browser/media/android/router/media_router_dialog_controller_android.cc

index a0b8e7ac99917cdfb16926065c4cc58a2907d724..46c67d325e0bb4ac6982f04788100fb7b2bb1ad3 100644

--- a/chrome/browser/media/android/router/media_router_dialog_controller_android.cc

+++ b/chrome/browser/media/android/router/media_router_dialog_controller_android.cc

@@ -151,7 +151,11 @@ bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {

}

void MediaRouterDialogControllerAndroid::OnRoutesUpdated(

- const std::vector<MediaRoute>& routes) {

+ const std::vector<MediaRoute>& routes,

+ const std::vector<MediaRoute::Id>& joinable_route_ids) {

+ // Android does not currently support joinable non-local routes.

+ DCHECK(joinable_route_ids.empty());

imcheng 2015/12/17 02:30:57 This DCHECK is not needed. |joinable_route_ids| is

matt.boetger 2015/12/18 23:37:14 +mfoltz This was asked for by mfoltz@

if (routes.size() != 1) {

single_existing_route_.reset();

return;