[Presentation API] Mojo typemap for content::PresentationConnectionMessage

content/renderer/presentation/presentation_dispatcher.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
 #define CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "content/common/content_export.h"
+#include "content/public/common/presentation_connection_message.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"
 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "url/gurl.h"
 
 namespace blink {
 class WebPresentationAvailabilityObserver;
 class WebPresentationConnection;
@@ skipping 36 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(PresentationDispatcherTest, TestCloseSession);
   FRIEND_TEST_ALL_PREFIXES(PresentationDispatcherTest, TestTerminateSession);
   FRIEND_TEST_ALL_PREFIXES(PresentationDispatcherTest,
                            TestListenForScreenAvailability);
   FRIEND_TEST_ALL_PREFIXES(PresentationDispatcherTest,
                            TestSetDefaultPresentationUrls);
 
   struct SendMessageRequest {
     SendMessageRequest(
         const PresentationSessionInfo& session_info,
-        blink::mojom::ConnectionMessagePtr message,
+        PresentationConnectionMessage connection_message,

[imcheng, 2017/02/25 01:08:40]

can this be PresentationConnectionMessage&& ?

[dcheng, 2017/02/25 07:17:27]

Chromium style is to use pass-by-value for move-only types, and use std::move().

[mark a. foltz, 2017/02/27 23:25:15]

Acknowledged.

         const blink::WebPresentationConnectionProxy* connection_proxy);
 
     ~SendMessageRequest();
 
     PresentationSessionInfo session_info;
-    blink::mojom::ConnectionMessagePtr message;
+    PresentationConnectionMessage message;
     // Proxy of Blink connection object |connection| calling connection.send().
     // It does not take ownership of proxy object. Proxy object is owned by
     // Blink connection. Blink connection is destroyed after
     // PresentationDispatcher so |connection_proxy| should always be valid.
     const blink::WebPresentationConnectionProxy* connection_proxy;
   };
 
   static SendMessageRequest* CreateSendTextMessageRequest(
       const blink::WebURL& presentationUrl,
       const blink::WebString& presentationId,
       const blink::WebString& message,
       const blink::WebPresentationConnectionProxy* connection_proxy);
   static SendMessageRequest* CreateSendBinaryMessageRequest(
       const blink::WebURL& presentationUrl,
       const blink::WebString& presentationId,
-      blink::mojom::PresentationMessageType type,
       const uint8_t* data,
       size_t length,
       const blink::WebPresentationConnectionProxy* connection_proxy);
 
   // WebPresentationClient implementation.
   void setController(blink::WebPresentationController* controller) override;
   void setReceiver(blink::WebPresentationReceiver*) override;
   void startSession(const blink::WebVector<blink::WebURL>& presentationUrls,
                     std::unique_ptr<blink::WebPresentationConnectionCallbacks>
                         callback) override;
@@ skipping 40 matching lines @@
   // blink::mojom::PresentationServiceClient
   void OnScreenAvailabilityNotSupported(const GURL& url) override;
   void OnScreenAvailabilityUpdated(const GURL& url, bool available) 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(
       const PresentationSessionInfo& session_info,
-      std::vector<blink::mojom::ConnectionMessagePtr> messages) override;
+      const std::vector<PresentationConnectionMessage>& messages) override;
   void OnDefaultSessionStarted(
       const PresentationSessionInfo& session_info) override;
 
   void OnSessionCreated(
       std::unique_ptr<blink::WebPresentationConnectionCallbacks> callback,
       const base::Optional<PresentationSessionInfo>& session_info,
       const base::Optional<PresentationError>& error);
   void OnReceiverConnectionAvailable(
       const PresentationSessionInfo& session_info,
       blink::mojom::PresentationConnectionPtr /*connection*/,
@@ skipping 105 matching lines @@
   // Returns UNKNOWN if all urls in |urls| have screen availability
   // UNKNOWN.
   ScreenAvailability GetScreenAvailability(const std::vector<GURL>& urls) const;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_