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

chrome/browser/media/router/media_router_base.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/router/media_router_base.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #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"
 
 namespace media_router {
 
 // A MediaRoutesObserver that maintains state about the current set of media
 // routes.
 class MediaRouterBase::InternalMediaRoutesObserver
     : public MediaRoutesObserver {
  public:
@@ skipping 47 matching lines @@
 
 void MediaRouterBase::OnIncognitoProfileShutdown() {
   for (const auto& route_id : internal_routes_observer_->incognito_route_ids)
     TerminateRoute(route_id);
 }
 
 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
 std::string MediaRouterBase::CreatePresentationId() {
   return "mr_" + base::GenerateGUID();
 }
 
 void MediaRouterBase::NotifyPresentationConnectionStateChange(
     const MediaRoute::Id& route_id,
     content::PresentationConnectionState state) {
@@ skipping 19 matching lines @@
       content::PRESENTATION_CONNECTION_STATE_CLOSED);
   info.close_reason = reason;
   info.message = message;
   it->second->Notify(info);
 }
 
 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
   // outside of the ctor
   internal_routes_observer_.reset(new InternalMediaRoutesObserver(this));
   initialized_ = true;
 }
 
 void MediaRouterBase::OnPresentationConnectionStateCallbackRemoved(
     const MediaRoute::Id& route_id) {
   auto it = presentation_connection_state_callbacks_.find(route_id);
   if (it != presentation_connection_state_callbacks_.end() &&
       it->second->empty()) {
     presentation_connection_state_callbacks_.erase(route_id);
   }
 }
 
 void MediaRouterBase::Shutdown() {
   // The observer calls virtual methods on MediaRouter; it must be destroyed
   // outside of the dtor
   internal_routes_observer_.reset();
 }
 
+void MediaRouterBase::DetachRouteController(const MediaRoute::Id& route_id,
+                                            MediaRouteController* controller) {}
+
 }  // namespace media_router