| Index: content/public/browser/presentation_session_message.cc
|
| diff --git a/content/public/browser/presentation_session_message.cc b/content/public/browser/presentation_session_message.cc
|
| index a03a055b0049e65eb7ceb22d4fd2b905ed4459c0..c8b5fc9e0acfae4c2a30b2dbda8cbe7f72accb37 100644
|
| --- a/content/public/browser/presentation_session_message.cc
|
| +++ b/content/public/browser/presentation_session_message.cc
|
| @@ -13,17 +13,20 @@ PresentationSessionMessage::PresentationSessionMessage(
|
| : presentation_url(presentation_url),
|
| presentation_id(presentation_id),
|
| message(message.Pass()),
|
| - data(nullptr) {
|
| + data(nullptr),
|
| + type(PresentationMessageType::TEXT) {
|
| }
|
|
|
| PresentationSessionMessage::PresentationSessionMessage(
|
| const std::string& presentation_url,
|
| const std::string& presentation_id,
|
| - scoped_ptr<std::vector<uint8_t>> data)
|
| + scoped_ptr<std::vector<uint8_t>> data,
|
| + PresentationMessageType type)
|
| : presentation_url(presentation_url),
|
| presentation_id(presentation_id),
|
| message(nullptr),
|
| - data(data.Pass()) {
|
| + data(data.Pass()),
|
| + type(type) {
|
| }
|
|
|
| // static
|
| @@ -41,9 +44,10 @@ scoped_ptr<PresentationSessionMessage>
|
| PresentationSessionMessage::CreateBinaryMessage(
|
| const std::string& presentation_url,
|
| const std::string& presentation_id,
|
| - scoped_ptr<std::vector<uint8_t>> data) {
|
| + scoped_ptr<std::vector<uint8_t>> data,
|
| + PresentationMessageType type) {
|
| return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage(
|
| - presentation_url, presentation_id, data.Pass()));
|
| + presentation_url, presentation_id, data.Pass(), type));
|
| }
|
|
|
| bool PresentationSessionMessage::is_binary() const {
|
|
|