| 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 4d7bfd538106ade384574cce5c6cd2ea1b3ce039..24c78d7c5b4098f60fe056fb664c5a1923f13b40 100644
|
| --- a/content/public/browser/presentation_session_message.cc
|
| +++ b/content/public/browser/presentation_session_message.cc
|
| @@ -7,65 +7,13 @@
|
| namespace content {
|
|
|
| PresentationSessionMessage::PresentationSessionMessage(
|
| - const std::string& presentation_url,
|
| - const std::string& presentation_id,
|
| - scoped_ptr<std::string> message)
|
| - : presentation_url(presentation_url),
|
| - presentation_id(presentation_id),
|
| - type(PresentationMessageType::TEXT),
|
| - message(message.Pass()),
|
| - data(nullptr) {
|
| -}
|
| -
|
| -PresentationSessionMessage::PresentationSessionMessage(
|
| - const std::string& presentation_url,
|
| - const std::string& presentation_id,
|
| - PresentationMessageType type,
|
| - scoped_ptr<std::vector<uint8_t>> data)
|
| - : presentation_url(presentation_url),
|
| - presentation_id(presentation_id),
|
| - type(type),
|
| - message(nullptr),
|
| - data(data.Pass()) {
|
| -}
|
| + PresentationMessageType type)
|
| + : type(type) {}
|
|
|
| -// static
|
| -scoped_ptr<PresentationSessionMessage>
|
| -PresentationSessionMessage::CreateStringMessage(
|
| - const std::string& presentation_url,
|
| - const std::string& presentation_id,
|
| - scoped_ptr<std::string> message) {
|
| - return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage(
|
| - presentation_url, presentation_id, message.Pass()));
|
| -}
|
| -
|
| -// static
|
| -scoped_ptr<PresentationSessionMessage>
|
| -PresentationSessionMessage::CreateArrayBufferMessage(
|
| - const std::string& presentation_url,
|
| - const std::string& presentation_id,
|
| - scoped_ptr<std::vector<uint8_t>> data) {
|
| - return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage(
|
| - presentation_url, presentation_id, PresentationMessageType::ARRAY_BUFFER,
|
| - data.Pass()));
|
| -}
|
| -
|
| -// static
|
| -scoped_ptr<PresentationSessionMessage>
|
| -PresentationSessionMessage::CreateBlobMessage(
|
| - const std::string& presentation_url,
|
| - const std::string& presentation_id,
|
| - scoped_ptr<std::vector<uint8_t>> data) {
|
| - return scoped_ptr<PresentationSessionMessage>(new PresentationSessionMessage(
|
| - presentation_url, presentation_id, PresentationMessageType::BLOB,
|
| - data.Pass()));
|
| -}
|
| +PresentationSessionMessage::~PresentationSessionMessage() {}
|
|
|
| bool PresentationSessionMessage::is_binary() const {
|
| return data != nullptr;
|
| }
|
|
|
| -PresentationSessionMessage::~PresentationSessionMessage() {
|
| -}
|
| -
|
| } // namespace content
|
|
|