Non-Local Join for Media Router and Presentation API

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/android/router/media_router_dialog_controller_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/media/android/router/media_router_android.h"
@@ skipping 133 matching lines @@
       env, java_dialog_controller_.obj());
 }
 
 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_ChromeMediaRouterDialogController_isShowingDialog(
       env, java_dialog_controller_.obj());
 }
 
 void MediaRouterDialogControllerAndroid::OnRoutesUpdated(
-    const std::vector<MediaRoute>& routes) {
+    const std::vector<MediaRoute>& routes,
+    const std::vector<MediaRoute::Id>& joinable_route_ids) {
+

[mark a. foltz, 2015/12/09 00:48:16]

Maybe DCHECK(joinable_route_ids.empty())

[matt.boetger, 2015/12/15 19:21:20]

Done.

   if (routes.size() != 1) {
     single_existing_route_.reset();
     return;
   }
 
   if (single_existing_route_.get() &&
       single_existing_route_->media_route_id() == routes[0].media_route_id()) {
     return;
   }
 
   single_existing_route_.reset(new MediaRoute(routes[0]));
 }
 
 }  // namespace media_router