Shows a launch spinner next to a sink once it is selected to create a route. The launch spinner sur…

chrome/browser/ui/webui/media_router/media_router_ui.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/webui/media_router/media_router_ui.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/media/router/create_presentation_session_request.h"
@@ skipping 265 matching lines @@
   if (ui_initialized_)
     handler_->UpdateIssue(issue);
 }
 
 void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
   routes_ = routes;
   if (ui_initialized_)
     handler_->UpdateRoutes(routes_);
 }
 
-void MediaRouterUI::OnRouteResponseReceived(const MediaRoute* route,
+void MediaRouterUI::OnRouteResponseReceived(const MediaSink::Id& sink_id,
+                                            const MediaRoute* route,
                                             const std::string& error) {
   DVLOG(1) << "OnRouteResponseReceived";
   // TODO(imcheng): Display error in UI. (crbug.com/490372)
-  if (!route)
+  if (!route) {

[apacible, 2015/08/10 14:13:27]

To simplify, maybe something like this for L291-296?

if (!route)
  LOG(ERROR)...

handler_->OnCreateRouteResponseReceived(sink_id, route);

[haibinlu, 2015/08/11 01:31:47]

Done.

+    handler_->OnCreateRouteResponseReceived(sink_id, nullptr);
     LOG(ERROR) << "MediaRouteResponse returned error: " << error;
-  else
-    handler_->AddRoute(*route);
+  } else {
+    handler_->OnCreateRouteResponseReceived(sink_id, route);
+  }
 
   has_pending_route_request_ = false;
   requesting_route_for_default_source_ = false;
 }
 
 bool MediaRouterUI::DoCreateRoute(const MediaSink::Id& sink_id,
                                   MediaCastMode cast_mode) {
   DCHECK(query_result_manager_.get());
   DCHECK(initiator_);
 
@@ skipping 28 matching lines @@
   // notification necessary.
   // (2) Presentation route request for a Presentation API startSession call.
   // The startSession (CreatePresentationSessionRequest) will need to be
   // answered with the
   // route response.
   // (3) Browser-initiated presentation route request. If successful,
   // PresentationServiceDelegateImpl will have to be notified. Note that we
   // treat subsequent route requests from a Presentation API-initiated dialogs
   // as browser-initiated.
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(base::Bind(
-      &MediaRouterUI::OnRouteResponseReceived, weak_factory_.GetWeakPtr()));
+  route_response_callbacks.push_back(
+      base::Bind(&MediaRouterUI::OnRouteResponseReceived,
+                 weak_factory_.GetWeakPtr(), sink_id));
   if (requesting_route_for_default_source_) {
     if (presentation_request_) {
       // |presentation_request_| will be nullptr after this call, as the
       // object will be transferred to the callback.
       route_response_callbacks.push_back(
           base::Bind(&HandleRouteResponseForPresentationApi,
                      base::Passed(&presentation_request_)));
     } else if (presentation_service_delegate_) {
       route_response_callbacks.push_back(
           base::Bind(&PresentationServiceDelegateImpl::OnRouteResponse,
                      presentation_service_delegate_));
     }
   }
 
   router_->CreateRoute(source.id(), sink_id, origin,
                        SessionTabHelper::IdForTab(initiator_),
                        route_response_callbacks);
   return true;
 }
 
 std::string MediaRouterUI::GetFrameURLHost() const {
   return GetHostFromURL(frame_url_);
 }
 
 const std::string& MediaRouterUI::GetRouteProviderExtensionId() const {
   return router_->media_route_provider_extension_id();
 }
 
+const std::set<MediaSink::Id>& MediaRouterUI::GetSinkIdsInLaunch() const {
+  return router_->sink_ids_in_launch();
+}
+
 }  // namespace media_router