Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: components/arc/bluetooth/bluetooth_struct_traits.h

Issue 2511253002: arc: bluetooth: enable use_new_wrapper_types for bluetooth.mojom (Closed)
Patch Set: Rebase again Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_ 5 #ifndef COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_
6 #define COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_ 6 #define COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_
7 7
8 #include <memory>
9 #include <vector>
10
8 #include "components/arc/common/bluetooth.mojom.h" 11 #include "components/arc/common/bluetooth.mojom.h"
9 #include "device/bluetooth/bluetooth_advertisement.h" 12 #include "device/bluetooth/bluetooth_advertisement.h"
10 #include "device/bluetooth/bluetooth_common.h" 13 #include "device/bluetooth/bluetooth_common.h"
11 #include "device/bluetooth/bluetooth_uuid.h" 14 #include "device/bluetooth/bluetooth_uuid.h"
12 #include "device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.h" 15 #include "device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.h"
13 16
14 namespace mojo { 17 namespace mojo {
15 18
16 template <> 19 template <>
17 struct EnumTraits<arc::mojom::BluetoothDeviceType, 20 struct EnumTraits<arc::mojom::BluetoothDeviceType,
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 NOTREACHED(); 118 NOTREACHED();
116 return arc::mojom::BluetoothAdvertisementType::ADV_TYPE_NON_CONNECTABLE; 119 return arc::mojom::BluetoothAdvertisementType::ADV_TYPE_NON_CONNECTABLE;
117 } 120 }
118 121
119 static bool include_tx_power( 122 static bool include_tx_power(
120 std::unique_ptr<device::BluetoothAdvertisement::Data>& input) { 123 std::unique_ptr<device::BluetoothAdvertisement::Data>& input) {
121 NOTREACHED(); 124 NOTREACHED();
122 return false; 125 return false;
123 } 126 }
124 127
125 static mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr> data( 128 static std::vector<arc::mojom::BluetoothAdvertisingDataPtr> data(
126 std::unique_ptr<device::BluetoothAdvertisement::Data>& input) { 129 std::unique_ptr<device::BluetoothAdvertisement::Data>& input) {
127 NOTREACHED(); 130 NOTREACHED();
128 return mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr>(); 131 return std::vector<arc::mojom::BluetoothAdvertisingDataPtr>();
129 } 132 }
130 }; 133 };
131 134
132 } // namespace mojo 135 } // namespace mojo
133 136
134 #endif // COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_ 137 #endif // COMPONENTS_ARC_BLUETOOTH_BLUETOOTH_STRUCT_TRAITS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698