Implements ListenForSessionMessages in PresentationServiceImpl; uses Swap to avoid copying large da…

content/public/browser/presentation_session_message.h

Index: content/public/browser/presentation_session_message.h
diff --git a/content/public/browser/presentation_session_message.h b/content/public/browser/presentation_session_message.h
new file mode 100644
index 0000000000000000000000000000000000000000..a9ea3632bea86e4f43d91b9adb7a1e3e8ea0e1f1
--- /dev/null
+++ b/content/public/browser/presentation_session_message.h
@@ -0,0 +1,52 @@
+// 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_PUBLIC_BROWSER_PRESENTATION_SESSION_MESSAGE_H_
+#define CONTENT_PUBLIC_BROWSER_PRESENTATION_SESSION_MESSAGE_H_
+
+#include <string>
+#include <vector>
+
+#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
+
+namespace content {
+
+// Represents a presentation session message.
+// If this is a text message, |data| is null; otherwise, |message| is null.
+// Empty messages are allowed.
+struct CONTENT_EXPORT PresentationSessionMessage {
+ public:
+  ~PresentationSessionMessage();
+
+  // Creates string message, which takes the ownership of |message|.
+  static scoped_ptr<PresentationSessionMessage> CreateStringMessage(

[imcheng (use chromium acct), 2015/05/04 19:53:55]

I think you also need to add CONTENT_EXPORT to static functions.

[haibinlu, 2015/05/04 21:33:50]

Done.

+      const std::string& presentation_url,
+      const std::string& presentation_id,
+      scoped_ptr<std::string> message);
+
+  // Creates binary message, which takes the ownership of |data|.
+  static scoped_ptr<PresentationSessionMessage> CreateBinaryMessage(
+      const std::string& presentation_url,
+      const std::string& presentation_id,
+      scoped_ptr<std::vector<uint8_t>> data);
+
+  bool is_binary() const;
+  const std::string presentation_url;
+  const std::string presentation_id;
+  scoped_ptr<std::string> message;
+  scoped_ptr<std::vector<uint8_t>> data;
+
+ private:
+  PresentationSessionMessage(const std::string& presentation_url,
+                             const std::string& presentation_id,
+                             scoped_ptr<std::string> message);
+  PresentationSessionMessage(const std::string& presentation_url,
+                             const std::string& presentation_id,
+                             scoped_ptr<std::vector<uint8_t>> data);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_BROWSER_PRESENTATION_SESSION_H_