Chromium Code Reviews| Index: content/renderer/presentation/presentation_connection_client.cc |
| diff --git a/content/renderer/presentation/presentation_connection_client.cc b/content/renderer/presentation/presentation_connection_client.cc |
| index 145e08db32eae6ee210458173ec1056bca86b954..496de2c6210755c3129bebccc5bb6105718a2d3f 100644 |
| --- a/content/renderer/presentation/presentation_connection_client.cc |
| +++ b/content/renderer/presentation/presentation_connection_client.cc |
| @@ -7,19 +7,20 @@ |
| #include "base/logging.h" |
| #include "third_party/WebKit/public/platform/WebString.h" |
| #include "third_party/WebKit/public/platform/WebURL.h" |
| +#include "third_party/WebKit/public/platform/modules/presentation/WebPresentationConnectionProxy.h" |
| namespace content { |
| PresentationConnectionClient::PresentationConnectionClient( |
| blink::mojom::PresentationSessionInfoPtr session_info) |
| - : url_(session_info->url), |
| - id_(blink::WebString::fromUTF8(session_info->id)) {} |
| + : PresentationConnectionClient(std::move(session_info), nullptr) {} |
|
mark a. foltz
2016/11/16 01:16:39
If this object is taking ownership of |session_inf
zhaobin
2016/11/23 22:52:29
Done.
|
| PresentationConnectionClient::PresentationConnectionClient( |
| - const GURL& url, |
| - const mojo::String& id) |
| - : url_(url), |
| - id_(blink::WebString::fromUTF8(id)) {} |
| + blink::mojom::PresentationSessionInfoPtr session_info, |
| + std::unique_ptr<blink::WebPresentationConnectionProxy> proxy) |
| + : url_(session_info->url), |
| + id_(blink::WebString::fromUTF8(session_info->id)), |
| + proxy_(std::move(proxy)) {} |
| PresentationConnectionClient::~PresentationConnectionClient() { |
| } |
| @@ -32,4 +33,9 @@ blink::WebString PresentationConnectionClient::getId() { |
| return id_; |
| } |
| +std::unique_ptr<blink::WebPresentationConnectionProxy> |
| +PresentationConnectionClient::takeProxy() { |
| + return std::move(proxy_); |
| +} |
| + |
| } // namespace content |