Non-Local Join for Media Router and Presentation API

chrome/browser/ui/ash/cast_config_delegate_media_router.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/ui/ash/cast_config_delegate_media_router.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_factory.h"
@@ skipping 28 matching lines @@
 }  // namespace
 
 // This class caches the values that the observers give us so we can query them
 // at any point in time. It also emits a device refresh event when new data is
 // available.
 class CastDeviceCache : public media_router::MediaRoutesObserver,
                         public media_router::MediaSinksObserver {
  public:
   using MediaSinks = std::vector<media_router::MediaSink>;
   using MediaRoutes = std::vector<media_router::MediaRoute>;
+  using MediaRouteIds = std::vector<media_router::MediaRoute::Id>;
 
   explicit CastDeviceCache(ash::CastConfigDelegate* cast_config_delegate);
   ~CastDeviceCache() override;
 
   const MediaSinks& sinks() const { return sinks_; }
   const MediaRoutes& routes() const { return routes_; }
 
  private:
   // media_router::MediaSinksObserver:
   void OnSinksReceived(const MediaSinks& sinks) override;
 
   // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const MediaRoutes& routes) override;
+  void OnRoutesUpdated(const MediaRoutes& routes,
+                       const MediaRouteIds& joinable_route_ids) override;
 
   MediaSinks sinks_;
   MediaRoutes routes_;
 
   // Not owned.
   ash::CastConfigDelegate* cast_config_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(CastDeviceCache);
 };
 
 CastDeviceCache::CastDeviceCache(ash::CastConfigDelegate* cast_config_delegate)
     : MediaRoutesObserver(GetMediaRouter()),
       MediaSinksObserver(GetMediaRouter(),
                          media_router::MediaSourceForDesktop()),
       cast_config_delegate_(cast_config_delegate) {
   CHECK(MediaSinksObserver::Init());
 }
 
 CastDeviceCache::~CastDeviceCache() {}
 
 void CastDeviceCache::OnSinksReceived(const MediaSinks& sinks) {
   sinks_ = sinks;
   cast_config_delegate_->RequestDeviceRefresh();
 }
 
-void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes) {
+void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes,
+                                      const MediaRouteIds& joinable_route_ids) {

[stevenjb, 2016/01/05 20:10:23]

unused_joinable_route_ids

[matt.boetger, 2016/01/06 22:49:07]

Done.

   routes_ = routes;
   cast_config_delegate_->RequestDeviceRefresh();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CastConfigDelegateMediaRouter:
 
 // static
 bool CastConfigDelegateMediaRouter::IsEnabled() {
   return media_router::MediaRouterEnabled(
@@ skipping 93 matching lines @@
 void CastConfigDelegateMediaRouter::StopCasting(const std::string& route_id) {
   GetMediaRouter()->CloseRoute(route_id);
 }
 
 bool CastConfigDelegateMediaRouter::HasOptions() const {
   // There are no plans to have an options page for the MediaRouter.
   return false;
 }
 
 void CastConfigDelegateMediaRouter::LaunchCastOptions() {}