| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/android/router/media_router_android.h" | 5 #include "chrome/browser/media/android/router/media_router_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 if (!request) | 363 if (!request) |
| 364 return; | 364 return; |
| 365 | 365 |
| 366 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id), | 366 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id), |
| 367 request->media_source, | 367 request->media_source, |
| 368 ConvertJavaStringToUTF8(env, jsink_id), std::string(), | 368 ConvertJavaStringToUTF8(env, jsink_id), std::string(), |
| 369 jis_local, std::string(), | 369 jis_local, std::string(), |
| 370 true); // TODO(avayvod): Populate for_display. | 370 true); // TODO(avayvod): Populate for_display. |
| 371 | 371 |
| 372 std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess( | 372 std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess( |
| 373 base::MakeUnique<MediaRoute>(route), request->presentation_id); | 373 route, request->presentation_id); |
| 374 for (const MediaRouteResponseCallback& callback : request->callbacks) | 374 for (const MediaRouteResponseCallback& callback : request->callbacks) |
| 375 callback.Run(*result); | 375 callback.Run(*result); |
| 376 | 376 |
| 377 route_requests_.Remove(jroute_request_id); | 377 route_requests_.Remove(jroute_request_id); |
| 378 | 378 |
| 379 active_routes_.push_back(route); | 379 active_routes_.push_back(route); |
| 380 for (auto& observer : routes_observers_) | 380 for (auto& observer : routes_observers_) |
| 381 observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()); | 381 observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()); |
| 382 } | 382 } |
| 383 | 383 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 return; | 452 return; |
| 453 | 453 |
| 454 std::vector<RouteMessage> messages(1); | 454 std::vector<RouteMessage> messages(1); |
| 455 messages.front().type = RouteMessage::TEXT; | 455 messages.front().type = RouteMessage::TEXT; |
| 456 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); | 456 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); |
| 457 for (auto& observer : *it->second.get()) | 457 for (auto& observer : *it->second.get()) |
| 458 observer.OnMessagesReceived(messages); | 458 observer.OnMessagesReceived(messages); |
| 459 } | 459 } |
| 460 | 460 |
| 461 } // namespace media_router | 461 } // namespace media_router |
| OLD | NEW |