Chromium Code Reviews| 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 bfc2865f02bb0e57b8e7e10c1861201dbb2f9330..ddca5988cef6b3eabbe2910c829b33fdb7dc3b5a 100644 |
| --- a/chrome/browser/ui/webui/media_router/media_router_ui.cc |
| +++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc |
| @@ -283,15 +283,15 @@ void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) { |
| 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) |
| LOG(ERROR) << "MediaRouteResponse returned error: " << error; |
|
Kevin M
2015/08/11 21:28:47
LOG(ERROR) is probably too spammy, esp. because th
haibinlu
2015/08/12 20:32:53
Done.
|
| - else |
| - handler_->AddRoute(*route); |
| + handler_->OnCreateRouteResponseReceived(sink_id, route); |
| has_pending_route_request_ = false; |
| requesting_route_for_default_source_ = false; |
| } |
| @@ -339,8 +339,9 @@ bool MediaRouterUI::DoCreateRoute(const MediaSink::Id& sink_id, |
| // 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 |