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

Unified Diff: content/renderer/presentation/presentation_dispatcher.h

Issue 2613153003: [Presentation API] Replaces type converters with typemaps (Closed)
Patch Set: Extend presentation ID max length to 64. 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/presentation/presentation_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index d8462f841ac73c8c8addf415ddea19b3c37836c7..1d6c519da1379d8b4c0ac5152eadd3b098688ec2 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -19,6 +19,7 @@
#include "base/id_map.h"
#include "base/macros.h"
#include "content/common/content_export.h"
+#include "content/public/common/presentation_session.h"
#include "content/public/renderer/render_frame_observer.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h"
@@ -70,12 +71,13 @@ class CONTENT_EXPORT PresentationDispatcher
struct SendMessageRequest {
SendMessageRequest(
- blink::mojom::PresentationSessionInfoPtr session_info,
+ const PresentationSessionInfo& session_info,
blink::mojom::ConnectionMessagePtr message,
const blink::WebPresentationConnectionProxy* connection_proxy);
+
~SendMessageRequest();
- blink::mojom::PresentationSessionInfoPtr session_info;
+ PresentationSessionInfo session_info;
blink::mojom::ConnectionMessagePtr message;
// Proxy of Blink connection object |connection| calling connection.send().
// It does not take ownership of proxy object. Proxy object is owned by
@@ -146,27 +148,26 @@ class CONTENT_EXPORT PresentationDispatcher
// blink::mojom::PresentationServiceClient
void OnScreenAvailabilityNotSupported(const GURL& url) override;
void OnScreenAvailabilityUpdated(const GURL& url, bool available) override;
- void OnConnectionStateChanged(
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationConnectionState state) override;
- void OnConnectionClosed(
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationConnectionCloseReason reason,
- const std::string& message) override;
+ void OnConnectionStateChanged(const PresentationSessionInfo& session_info,
+ PresentationConnectionState state) override;
+ void OnConnectionClosed(const PresentationSessionInfo& session_info,
+ PresentationConnectionCloseReason reason,
+ const std::string& message) override;
void OnConnectionMessagesReceived(
- blink::mojom::PresentationSessionInfoPtr session_info,
+ const PresentationSessionInfo& session_info,
std::vector<blink::mojom::ConnectionMessagePtr> messages) override;
void OnDefaultSessionStarted(
- blink::mojom::PresentationSessionInfoPtr session_info) override;
+ const PresentationSessionInfo& session_info) override;
void OnSessionCreated(
std::unique_ptr<blink::WebPresentationConnectionCallbacks> callback,
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationErrorPtr error);
+ const base::Optional<PresentationSessionInfo>& session_info,
+ const base::Optional<PresentationError>& error);
void OnReceiverConnectionAvailable(
- blink::mojom::PresentationSessionInfoPtr,
- blink::mojom::PresentationConnectionPtr,
- blink::mojom::PresentationConnectionRequest) override;
+ const PresentationSessionInfo& session_info,
+ blink::mojom::PresentationConnectionPtr /*connection*/,
+ blink::mojom::PresentationConnectionRequest /*connection_request*/)
+ override;
// Call to PresentationService to send the message in |request|.
// |session_info| and |message| of |reuqest| will be consumed.

Powered by Google App Engine
This is Rietveld 408576698