Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Side by Side Diff: chrome/browser/media/android/router/media_router_android.cc

Issue 2666873006: [Media Router] Convert to use typemaps for media_router.mojom. (Closed)
Patch Set: Addressed Mark's comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 MediaRouteRequest* request = route_requests_.Lookup(jroute_request_id); 348 MediaRouteRequest* request = route_requests_.Lookup(jroute_request_id);
349 if (!request) 349 if (!request)
350 return; 350 return;
351 351
352 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id), 352 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id),
353 request->media_source, 353 request->media_source,
354 ConvertJavaStringToUTF8(env, jsink_id), std::string(), 354 ConvertJavaStringToUTF8(env, jsink_id), std::string(),
355 jis_local, std::string(), 355 jis_local, std::string(),
356 true); // TODO(avayvod): Populate for_display. 356 true); // TODO(avayvod): Populate for_display.
357 357
358 std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess( 358 std::unique_ptr<RouteRequestResult> result =
359 base::MakeUnique<MediaRoute>(route), request->presentation_id); 359 RouteRequestResult::FromSuccess(route, request->presentation_id);
360 for (const MediaRouteResponseCallback& callback : request->callbacks) 360 for (const MediaRouteResponseCallback& callback : request->callbacks)
361 callback.Run(*result); 361 callback.Run(*result);
362 362
363 route_requests_.Remove(jroute_request_id); 363 route_requests_.Remove(jroute_request_id);
364 364
365 active_routes_.push_back(route); 365 active_routes_.push_back(route);
366 for (auto& observer : routes_observers_) 366 for (auto& observer : routes_observers_)
367 observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()); 367 observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>());
368 } 368 }
369 369
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 return; 438 return;
439 439
440 std::vector<RouteMessage> messages(1); 440 std::vector<RouteMessage> messages(1);
441 messages.front().type = RouteMessage::TEXT; 441 messages.front().type = RouteMessage::TEXT;
442 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); 442 messages.front().text = ConvertJavaStringToUTF8(env, jmessage);
443 for (auto& observer : *it->second.get()) 443 for (auto& observer : *it->second.get())
444 observer.OnMessagesReceived(messages); 444 observer.OnMessagesReceived(messages);
445 } 445 }
446 446
447 } // namespace media_router 447 } // namespace media_router
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/router/BUILD.gn » ('j') | chrome/browser/media/router/media_route.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698