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

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

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 if (!request) 371 if (!request)
372 return; 372 return;
373 373
374 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id), 374 MediaRoute route(ConvertJavaStringToUTF8(env, jmedia_route_id),
375 request->media_source, 375 request->media_source,
376 ConvertJavaStringToUTF8(env, jsink_id), std::string(), 376 ConvertJavaStringToUTF8(env, jsink_id), std::string(),
377 jis_local, std::string(), 377 jis_local, std::string(),
378 true); // TODO(avayvod): Populate for_display. 378 true); // TODO(avayvod): Populate for_display.
379 379
380 std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess( 380 std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess(
381 base::WrapUnique(new MediaRoute(route)), request->presentation_id); 381 base::MakeUnique<MediaRoute>(route), request->presentation_id);
382 for (const MediaRouteResponseCallback& callback : request->callbacks) 382 for (const MediaRouteResponseCallback& callback : request->callbacks)
383 callback.Run(*result); 383 callback.Run(*result);
384 384
385 route_requests_.Remove(jroute_request_id); 385 route_requests_.Remove(jroute_request_id);
386 386
387 active_routes_.push_back(route); 387 active_routes_.push_back(route);
388 FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_, 388 FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
389 OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>())); 389 OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()));
390 } 390 }
391 391
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 return; 460 return;
461 461
462 std::vector<RouteMessage> messages(1); 462 std::vector<RouteMessage> messages(1);
463 messages.front().type = RouteMessage::TEXT; 463 messages.front().type = RouteMessage::TEXT;
464 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); 464 messages.front().text = ConvertJavaStringToUTF8(env, jmessage);
465 FOR_EACH_OBSERVER(RouteMessageObserver, *observer_list, 465 FOR_EACH_OBSERVER(RouteMessageObserver, *observer_list,
466 OnMessagesReceived(messages)); 466 OnMessagesReceived(messages));
467 } 467 }
468 468
469 } // namespace media_router 469 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698