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

Unified Diff: content/renderer/presentation/presentation_connection_client.cc

Issue 2379703002: [Presentation API] (alternative) 1-UA: send message between controller and receiver page (Closed)
Patch Set: merge with master Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
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) {}
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

Powered by Google App Engine
This is Rietveld 408576698