OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/public/browser/presentation_session_message.h" | 5 #include "content/public/browser/presentation_session_message.h" |
6 | 6 |
7 namespace content { | 7 namespace content { |
8 | 8 |
9 PresentationSessionMessage::PresentationSessionMessage( | 9 PresentationSessionMessage::PresentationSessionMessage( |
10 const std::string& presentation_url, | 10 const std::string& presentation_url, |
11 const std::string& presentation_id, | 11 const std::string& presentation_id, |
12 scoped_ptr<std::string> message) | 12 scoped_ptr<std::string> message) |
13 : presentation_url(presentation_url), | 13 : presentation_url(presentation_url), |
14 presentation_id(presentation_id), | 14 presentation_id(presentation_id), |
15 message(message.Pass()), | 15 message(message.Pass()), |
16 data(nullptr) { | 16 data(nullptr), |
| 17 type(PresentationMessageType::TEXT) { |
17 } | 18 } |
18 | 19 |
19 PresentationSessionMessage::PresentationSessionMessage( | 20 PresentationSessionMessage::PresentationSessionMessage( |
20 const std::string& presentation_url, | 21 const std::string& presentation_url, |
21 const std::string& presentation_id, | 22 const std::string& presentation_id, |
22 scoped_ptr<std::vector<uint8_t>> data) | 23 scoped_ptr<std::vector<uint8_t>> data, |
| 24 PresentationMessageType type) |
23 : presentation_url(presentation_url), | 25 : presentation_url(presentation_url), |
24 presentation_id(presentation_id), | 26 presentation_id(presentation_id), |
25 message(nullptr), | 27 message(nullptr), |
26 data(data.Pass()) { | 28 data(data.Pass()), |
| 29 type(type) { |
27 } | 30 } |
28 | 31 |
29 // static | 32 // static |
30 scoped_ptr<PresentationSessionMessage> | 33 scoped_ptr<PresentationSessionMessage> |
31 PresentationSessionMessage::CreateStringMessage( | 34 PresentationSessionMessage::CreateStringMessage( |
32 const std::string& presentation_url, | 35 const std::string& presentation_url, |
33 const std::string& presentation_id, | 36 const std::string& presentation_id, |
34 scoped_ptr<std::string> message) { | 37 scoped_ptr<std::string> message) { |
35 return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage( | 38 return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage( |
36 presentation_url, presentation_id, message.Pass())); | 39 presentation_url, presentation_id, message.Pass())); |
37 } | 40 } |
38 | 41 |
39 // static | 42 // static |
40 scoped_ptr<PresentationSessionMessage> | 43 scoped_ptr<PresentationSessionMessage> |
41 PresentationSessionMessage::CreateBinaryMessage( | 44 PresentationSessionMessage::CreateBinaryMessage( |
42 const std::string& presentation_url, | 45 const std::string& presentation_url, |
43 const std::string& presentation_id, | 46 const std::string& presentation_id, |
44 scoped_ptr<std::vector<uint8_t>> data) { | 47 scoped_ptr<std::vector<uint8_t>> data, |
| 48 PresentationMessageType type) { |
45 return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage( | 49 return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage( |
46 presentation_url, presentation_id, data.Pass())); | 50 presentation_url, presentation_id, data.Pass(), type)); |
47 } | 51 } |
48 | 52 |
49 bool PresentationSessionMessage::is_binary() const { | 53 bool PresentationSessionMessage::is_binary() const { |
50 return data != nullptr; | 54 return data != nullptr; |
51 } | 55 } |
52 | 56 |
53 PresentationSessionMessage::~PresentationSessionMessage() { | 57 PresentationSessionMessage::~PresentationSessionMessage() { |
54 } | 58 } |
55 | 59 |
56 } // namespace content | 60 } // namespace content |
OLD | NEW |