OLD | NEW |
---|---|
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, "", |
dcheng
2017/02/01 22:51:08
It feels weird that we pass this by unique_ptr: sh
imcheng
2017/02/02 21:20:37
I wanted FromSuccess and FromError to invoke the s
| |
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, "", error, result_code); |
dcheng
2017/02/01 22:51:08
Nit: "" should be std::string() here and above.
imcheng
2017/02/02 21:20:37
Done.
| |
26 new RouteRequestResult(nullptr, "", error, result_code)); | |
27 } | 26 } |
28 | 27 |
29 RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route, | 28 RouteRequestResult::RouteRequestResult(std::unique_ptr<MediaRoute> route, |
30 const std::string& presentation_id, | 29 const std::string& presentation_id, |
31 const std::string& error, | 30 const std::string& error, |
32 ResultCode result_code) | 31 ResultCode result_code) |
33 : route_(std::move(route)), | 32 : route_(std::move(route)), |
34 presentation_id_(presentation_id), | 33 presentation_id_(presentation_id), |
35 error_(error), | 34 error_(error), |
36 result_code_(result_code) { | 35 result_code_(result_code) { |
37 if (route_) | 36 if (route_) |
38 presentation_url_ = route_->media_source().url(); | 37 presentation_url_ = route_->media_source().url(); |
39 } | 38 } |
40 | 39 |
41 RouteRequestResult::~RouteRequestResult() = default; | 40 RouteRequestResult::~RouteRequestResult() = default; |
42 | 41 |
43 } // namespace media_router | 42 } // namespace media_router |
OLD | NEW |