| 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 "blimp/common/create_blimp_message.h" | 5 #include "blimp/common/create_blimp_message.h" | 
| 6 | 6 | 
| 7 #include <memory> | 7 #include <memory> | 
| 8 | 8 | 
| 9 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 10 #include "blimp/common/proto/blimp_message.pb.h" | 10 #include "blimp/common/proto/blimp_message.pb.h" | 
| 11 #include "blimp/common/proto/blob_channel.pb.h" | 11 #include "blimp/common/proto/blob_channel.pb.h" | 
| 12 #include "blimp/common/proto/compositor.pb.h" | 12 #include "blimp/common/proto/compositor.pb.h" | 
|  | 13 #include "blimp/common/proto/geolocation.pb.h" | 
| 13 #include "blimp/common/proto/input.pb.h" | 14 #include "blimp/common/proto/input.pb.h" | 
| 14 #include "blimp/common/proto/render_widget.pb.h" | 15 #include "blimp/common/proto/render_widget.pb.h" | 
| 15 #include "blimp/common/proto/settings.pb.h" | 16 #include "blimp/common/proto/settings.pb.h" | 
| 16 #include "blimp/common/proto/tab_control.pb.h" | 17 #include "blimp/common/proto/tab_control.pb.h" | 
| 17 | 18 | 
| 18 namespace blimp { | 19 namespace blimp { | 
| 19 | 20 | 
| 20 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 21 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 
| 21     CompositorMessage** compositor_message, | 22     CompositorMessage** compositor_message, | 
| 22     int target_tab_id) { | 23     int target_tab_id) { | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 80   return output; | 81   return output; | 
| 81 } | 82 } | 
| 82 | 83 | 
| 83 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 84 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 
| 84     BlobChannelMessage** blob_channel_message) { | 85     BlobChannelMessage** blob_channel_message) { | 
| 85   std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 86   std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 
| 86   *blob_channel_message = output->mutable_blob_channel(); | 87   *blob_channel_message = output->mutable_blob_channel(); | 
| 87   return output; | 88   return output; | 
| 88 } | 89 } | 
| 89 | 90 | 
|  | 91 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 
|  | 92     GeolocationMessage** geolocation_message) { | 
|  | 93   std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 
|  | 94   *geolocation_message = output->mutable_geolocation(); | 
|  | 95   return output; | 
|  | 96 } | 
|  | 97 | 
| 90 std::unique_ptr<BlimpMessage> CreateStartConnectionMessage( | 98 std::unique_ptr<BlimpMessage> CreateStartConnectionMessage( | 
| 91     const std::string& client_token, | 99     const std::string& client_token, | 
| 92     int protocol_version) { | 100     int protocol_version) { | 
| 93   std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 101   std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 
| 94 | 102 | 
| 95   ProtocolControlMessage* control_message = output->mutable_protocol_control(); | 103   ProtocolControlMessage* control_message = output->mutable_protocol_control(); | 
| 96   control_message->mutable_start_connection(); | 104   control_message->mutable_start_connection(); | 
| 97 | 105 | 
| 98   StartConnectionMessage* start_connection_message = | 106   StartConnectionMessage* start_connection_message = | 
| 99       control_message->mutable_start_connection(); | 107       control_message->mutable_start_connection(); | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 121 | 129 | 
| 122   ProtocolControlMessage* control_message = output->mutable_protocol_control(); | 130   ProtocolControlMessage* control_message = output->mutable_protocol_control(); | 
| 123   EndConnectionMessage* end_connection_message = | 131   EndConnectionMessage* end_connection_message = | 
| 124       control_message->mutable_end_connection(); | 132       control_message->mutable_end_connection(); | 
| 125   end_connection_message->set_reason(reason); | 133   end_connection_message->set_reason(reason); | 
| 126 | 134 | 
| 127   return output; | 135   return output; | 
| 128 } | 136 } | 
| 129 | 137 | 
| 130 }  // namespace blimp | 138 }  // namespace blimp | 
| OLD | NEW | 
|---|