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

Side by Side Diff: chrome/browser/media/router/route_request_result.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/router/route_request_result.h" 5 #include "chrome/browser/media/router/route_request_result.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/media/router/media_route.h" 8 #include "chrome/browser/media/router/media_route.h"
9 9
10 namespace media_router { 10 namespace media_router {
11 11
12 // static 12 // static
13 std::unique_ptr<RouteRequestResult> RouteRequestResult::FromSuccess( 13 std::unique_ptr<RouteRequestResult> RouteRequestResult::FromSuccess(
14 std::unique_ptr<MediaRoute> route, 14 const MediaRoute& route,
15 const std::string& presentation_id) { 15 const std::string& presentation_id) {
16 DCHECK(route); 16 return base::MakeUnique<RouteRequestResult>(
17 return base::WrapUnique(new RouteRequestResult( 17 base::MakeUnique<MediaRoute>(route), presentation_id, std::string(),
mark a. foltz 2017/02/09 22:53:52 It's weird to take a const reference to a MediaRou
18 std::move(route), presentation_id, "", RouteRequestResult::OK)); 18 RouteRequestResult::OK);
19 } 19 }
20 20
21 // static 21 // static
22 std::unique_ptr<RouteRequestResult> RouteRequestResult::FromError( 22 std::unique_ptr<RouteRequestResult> RouteRequestResult::FromError(
23 const std::string& error, 23 const std::string& error,
24 ResultCode result_code) { 24 ResultCode result_code) {
25 return base::WrapUnique( 25 return base::MakeUnique<RouteRequestResult>(nullptr, std::string(), error,
26 new RouteRequestResult(nullptr, "", error, result_code)); 26 result_code);
27 } 27 }
28 28
29 RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route, 29 RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route,
30 const std::string& presentation_id, 30 const std::string& presentation_id,
31 const std::string& error, 31 const std::string& error,
32 ResultCode result_code) 32 ResultCode result_code)
33 : route_(std::move(route)), 33 : route_(std::move(route)),
34 presentation_id_(presentation_id), 34 presentation_id_(presentation_id),
35 error_(error), 35 error_(error),
36 result_code_(result_code) { 36 result_code_(result_code) {
37 if (route_) 37 if (route_)
38 presentation_url_ = route_->media_source().url(); 38 presentation_url_ = route_->media_source().url();
39 } 39 }
40 40
41 RouteRequestResult::~RouteRequestResult() = default; 41 RouteRequestResult::~RouteRequestResult() = default;
42 42
43 } // namespace media_router 43 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698