[Media Router] Custom Controls 2 - add MediaRouter::GetRouteController()

chrome/browser/media/router/media_router_base.cc

Index: chrome/browser/media/router/media_router_base.cc
diff --git a/chrome/browser/media/router/media_router_base.cc b/chrome/browser/media/router/media_router_base.cc
index 923afc4efc79b6e37ec7dc9f865c8d1f5b3f6c2b..e67a40ee0a3dda3ed1f89c33dda670e50ff4c986 100644
--- a/chrome/browser/media/router/media_router_base.cc
+++ b/chrome/browser/media/router/media_router_base.cc
@@ -9,6 +9,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/media/router/mojo/media_route_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -76,6 +77,11 @@ std::vector<MediaRoute> MediaRouterBase::GetCurrentRoutes() const {
   return internal_routes_observer_->current_routes;
 }
 
+scoped_refptr<MediaRouteController> MediaRouterBase::GetRouteController(
+    const MediaRoute::Id& route_id) {
+  return nullptr;
+}
+
 MediaRouterBase::MediaRouterBase() : initialized_(false) {}
 
 // static
@@ -115,6 +121,14 @@ bool MediaRouterBase::HasJoinableRoute() const {
   return internal_routes_observer_->has_route;
 }
 
+bool MediaRouterBase::IsRouteValid(const std::string& route_id) const {
+  const auto& routes = internal_routes_observer_->current_routes;
+  return std::find_if(routes.begin(), routes.end(),

[mark a. foltz, 2017/04/11 19:43:19]

Can this be implemented in internal_routes_observer_, e.g. as
HasRoute(route_id)?

[takumif, 2017/04/12 23:11:36]

We could do that, but MRBase would still need a method that just calls that, in
order to expose it to MRMojoImpl. Would that be better?

+                      [&route_id](const MediaRoute& route) {
+                        return route.media_route_id() == route_id;
+                      }) != routes.end();
+}
+
 void MediaRouterBase::Initialize() {
   DCHECK(!initialized_);
   // The observer calls virtual methods on MediaRouter; it must be created
@@ -138,4 +152,7 @@ void MediaRouterBase::Shutdown() {
   internal_routes_observer_.reset();
 }
 
+void MediaRouterBase::DetachRouteController(const MediaRoute::Id& route_id,
+                                            MediaRouteController* controller) {}
+
 }  // namespace media_router