Non-Local Join for Media Router and Presentation API

chrome/browser/media/android/router/media_router_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 22 matching lines @@
       const MediaSink::Id& sink_id,
       const GURL& origin,
       content::WebContents* web_contents,
       const std::vector<MediaRouteResponseCallback>& callbacks) override;
   void JoinRoute(
       const MediaSource::Id& source,
       const std::string& presentation_id,
       const GURL& origin,
       content::WebContents* web_contents,
       const std::vector<MediaRouteResponseCallback>& callbacks) override;
+  void JoinRouteByRouteId(
+      const MediaSource::Id& source,
+      const MediaRoute::Id& route_id,
+      const GURL& origin,
+      content::WebContents* web_contents,
+      const std::vector<MediaRouteResponseCallback>& callbacks) override;
   void CloseRoute(const MediaRoute::Id& route_id) override;
   void SendRouteMessage(const MediaRoute::Id& route_id,
                         const std::string& message,
                         const SendRouteMessageCallback& callback) override;
   void SendRouteBinaryMessage(
       const MediaRoute::Id& route_id,
       scoped_ptr<std::vector<uint8>> data,
       const SendRouteMessageCallback& callback) override;
   void AddIssue(const Issue& issue) override;
   void ClearIssue(const Issue::Id& issue_id) override;
@@ skipping 55 matching lines @@
   void UnregisterLocalMediaRoutesObserver(
       LocalMediaRoutesObserver* observer) override;
 
   base::android::ScopedJavaGlobalRef<jobject> java_media_router_;
 
   using MediaSinkObservers = base::ScopedPtrHashMap<
       MediaSource::Id,
       scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
   MediaSinkObservers sinks_observers_;
 
-  base::ObserverList<MediaRoutesObserver> routes_observers_;
+  using MediaRouteObservers = base::ScopedPtrHashMap<
+      MediaSource::Id,
+      scoped_ptr<base::ObserverList<MediaRoutesObserver>>>;
+  MediaRouteObservers routes_observers_;
 
   struct MediaRouteRequest {
     MediaRouteRequest(
         const MediaSource& source,
         const std::string& presentation_id,
         const std::vector<MediaRouteResponseCallback>& callbacks);
     ~MediaRouteRequest();
 
     MediaSource media_source;
     std::string presentation_id;
@@ skipping 14 matching lines @@
       MediaRoute::Id,
       scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
   MessagesObservers messages_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
 };
 
 } // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_