OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "device/serial/serial_connection_factory.h" | 5 #include "device/serial/serial_connection_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/macros.h" |
9 #include "device/serial/serial_connection.h" | 10 #include "device/serial/serial_connection.h" |
10 #include "device/serial/serial_io_handler.h" | 11 #include "device/serial/serial_io_handler.h" |
11 | 12 |
12 namespace device { | 13 namespace device { |
13 namespace { | 14 namespace { |
14 | 15 |
15 void FillDefaultConnectionOptions(serial::ConnectionOptions* options) { | 16 void FillDefaultConnectionOptions(serial::ConnectionOptions* options) { |
16 if (!options->bitrate) | 17 if (!options->bitrate) |
17 options->bitrate = 9600; | 18 options->bitrate = 9600; |
18 if (options->data_bits == serial::DATA_BITS_NONE) | 19 if (options->data_bits == serial::DATA_BITS_NONE) |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 if (!success) { | 125 if (!success) { |
125 return; | 126 return; |
126 } | 127 } |
127 | 128 |
128 new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(), | 129 new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(), |
129 mojo::MakeProxy(source_client_.Pass()), | 130 mojo::MakeProxy(source_client_.Pass()), |
130 connection_request_.Pass()); | 131 connection_request_.Pass()); |
131 } | 132 } |
132 | 133 |
133 } // namespace device | 134 } // namespace device |
OLD | NEW |