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

Side by Side Diff: device/bluetooth/bluetooth_advertisement.h

Issue 1317933003: bluetooth-advertising: Fix wrong assignment and append of wrong type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-origin
Patch Set: Address armansito's comments Created 5 years, 3 months 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
« no previous file with comments | « device/BUILD.gn ('k') | device/bluetooth/bluetooth_advertisement_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_ptr<UUIDList> solicit_uuids() { return solicit_uuids_.Pass(); } 64 scoped_ptr<UUIDList> solicit_uuids() { return solicit_uuids_.Pass(); }
65 scoped_ptr<ServiceData> service_data() { return service_data_.Pass(); } 65 scoped_ptr<ServiceData> service_data() { return service_data_.Pass(); }
66 66
67 void set_service_uuids(scoped_ptr<UUIDList> service_uuids) { 67 void set_service_uuids(scoped_ptr<UUIDList> service_uuids) {
68 service_uuids_ = service_uuids.Pass(); 68 service_uuids_ = service_uuids.Pass();
69 } 69 }
70 void set_manufacturer_data(scoped_ptr<ManufacturerData> manufacturer_data) { 70 void set_manufacturer_data(scoped_ptr<ManufacturerData> manufacturer_data) {
71 manufacturer_data_ = manufacturer_data.Pass(); 71 manufacturer_data_ = manufacturer_data.Pass();
72 } 72 }
73 void set_solicit_uuids(scoped_ptr<UUIDList> solicit_uuids) { 73 void set_solicit_uuids(scoped_ptr<UUIDList> solicit_uuids) {
74 solicit_uuids = solicit_uuids_.Pass(); 74 solicit_uuids_ = solicit_uuids.Pass();
75 } 75 }
76 void set_service_data(scoped_ptr<ServiceData> service_data) { 76 void set_service_data(scoped_ptr<ServiceData> service_data) {
77 service_data = service_data_.Pass(); 77 service_data_ = service_data.Pass();
78 } 78 }
79 79
80 void set_include_tx_power(bool include_tx_power) { 80 void set_include_tx_power(bool include_tx_power) {
81 include_tx_power_ = include_tx_power; 81 include_tx_power_ = include_tx_power;
82 } 82 }
83 83
84 private: 84 private:
85 Data(); 85 Data();
86 86
87 AdvertisementType type_; 87 AdvertisementType type_;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // |observers_| are expected to outlive a BluetoothAdvertisement object. 128 // |observers_| are expected to outlive a BluetoothAdvertisement object.
129 base::ObserverList<BluetoothAdvertisement::Observer> observers_; 129 base::ObserverList<BluetoothAdvertisement::Observer> observers_;
130 130
131 private: 131 private:
132 DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisement); 132 DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisement);
133 }; 133 };
134 134
135 } // namespace device 135 } // namespace device
136 136
137 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_ 137 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_
OLDNEW
« no previous file with comments | « device/BUILD.gn ('k') | device/bluetooth/bluetooth_advertisement_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698