[Media Router] Close dialog after resolving presentation request

chrome/browser/ui/webui/media_router/media_router_ui.cc

Index: chrome/browser/ui/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index bb045896b2dbbab917e2daab026bbe6732e93690..d30a5798559607c93e81b1bfef35f9d84fd452c8 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -400,21 +400,23 @@ bool MediaRouterUI::SetRouteParameters(
 
   DVLOG(1) << "DoCreateRoute: origin: " << *origin;
 
-  // There are 3 cases. In all cases the MediaRouterUI will need to be notified.
+  // There are 3 cases. In cases (1) and (3) the MediaRouterUI will need to be
+  // notified. In case (2) the dialog will be closed.
   // (1) Non-presentation route request (e.g., mirroring). No additional
   // notification necessary.
   // (2) Presentation route request for a Presentation API startSession call.
   // The startSession (CreatePresentationConnectionRequest) will need to be
-  // answered with the
-  // route response.
+  // 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.
-  route_response_callbacks->push_back(base::Bind(
-      &MediaRouterUI::OnRouteResponseReceived, weak_factory_.GetWeakPtr(),
-      current_route_request_id_, sink_id, cast_mode,
-      base::UTF8ToUTF16(GetTruncatedPresentationRequestSourceName())));
+  if (!create_session_request_) {

[imcheng, 2016/06/08 19:02:18]

Should this be (!for_default_source || !create_session_request_)?

We'd still want to update the UI if user selected mirroring on a dialog
initiated from Presentation API.

I think we should just remove the mirroring cast modes for a dialog initiated
from Presentation API as they do not make sense in the context of a
PresentationRequest. But that can be done in another patch.

[btolsch, 2016/06/08 19:36:55]

Done.

[amp, 2016/06/08 19:53:50]

Would this mean that sinks which only support mirroring won't show up for
presentation requests?  That doesn't sound right to me, but perhaps I am
misunderstanding.

+    route_response_callbacks->push_back(base::Bind(
+        &MediaRouterUI::OnRouteResponseReceived, weak_factory_.GetWeakPtr(),
+        current_route_request_id_, sink_id, cast_mode,
+        base::UTF8ToUTF16(GetTruncatedPresentationRequestSourceName())));
+  }
   if (for_default_source) {
     if (create_session_request_) {
       // |create_session_request_| will be nullptr after this call, as the
@@ -422,6 +424,9 @@ bool MediaRouterUI::SetRouteParameters(
       route_response_callbacks->push_back(
           base::Bind(&CreatePresentationConnectionRequest::HandleRouteResponse,
                      base::Passed(&create_session_request_)));
+      route_response_callbacks->push_back(
+          base::Bind(&MediaRouterUI::HandleCreateSessionRequestRouteResponse,
+                     weak_factory_.GetWeakPtr()));
     } else if (presentation_service_delegate_) {
       route_response_callbacks->push_back(
           base::Bind(&PresentationServiceDelegateImpl::OnRouteResponse,
@@ -543,6 +548,11 @@ void MediaRouterUI::OnRouteResponseReceived(
     SendIssueForRouteTimeout(cast_mode, presentation_request_source_name);
 }
 
+void MediaRouterUI::HandleCreateSessionRequestRouteResponse(
+    const RouteRequestResult&) {
+  Close();
+}
+
 void MediaRouterUI::OnSearchSinkResponseReceived(
     MediaCastMode cast_mode,
     const MediaSink::Id& found_sink_id) {