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

Side by Side Diff: chromeos/components/tether/ble_advertiser.cc

Issue 2951303002: [CrOS Tether] Move LocalDeviceDataProvider from //chromeos/components/tether to //components/crypta… (Closed)
Patch Set: Rebased. Created 3 years, 6 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
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 #include "chromeos/components/tether/ble_advertiser.h" 5 #include "chromeos/components/tether/ble_advertiser.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chromeos/components/tether/ble_constants.h" 8 #include "chromeos/components/tether/ble_constants.h"
9 #include "chromeos/components/tether/local_device_data_provider.h" 9 #include "components/cryptauth/local_device_data_provider.h"
10 #include "components/cryptauth/proto/cryptauth_api.pb.h" 10 #include "components/cryptauth/proto/cryptauth_api.pb.h"
11 #include "components/cryptauth/remote_beacon_seed_fetcher.h" 11 #include "components/cryptauth/remote_beacon_seed_fetcher.h"
12 #include "components/proximity_auth/logging/logging.h" 12 #include "components/proximity_auth/logging/logging.h"
13 #include "device/bluetooth/bluetooth_advertisement.h" 13 #include "device/bluetooth/bluetooth_advertisement.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 namespace tether { 17 namespace tether {
18 18
19 namespace { 19 namespace {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 std::unique_ptr<device::BluetoothAdvertisement::ServiceData> service_data = 139 std::unique_ptr<device::BluetoothAdvertisement::ServiceData> service_data =
140 base::MakeUnique<device::BluetoothAdvertisement::ServiceData>(); 140 base::MakeUnique<device::BluetoothAdvertisement::ServiceData>();
141 service_data->insert(std::pair<std::string, std::vector<uint8_t>>( 141 service_data->insert(std::pair<std::string, std::vector<uint8_t>>(
142 std::string(kAdvertisingServiceUuid), data_as_vector)); 142 std::string(kAdvertisingServiceUuid), data_as_vector));
143 return service_data; 143 return service_data;
144 } 144 }
145 145
146 BleAdvertiser::BleAdvertiser( 146 BleAdvertiser::BleAdvertiser(
147 scoped_refptr<device::BluetoothAdapter> adapter, 147 scoped_refptr<device::BluetoothAdapter> adapter,
148 const LocalDeviceDataProvider* local_device_data_provider, 148 const cryptauth::LocalDeviceDataProvider* local_device_data_provider,
149 const cryptauth::RemoteBeaconSeedFetcher* remote_beacon_seed_fetcher) 149 const cryptauth::RemoteBeaconSeedFetcher* remote_beacon_seed_fetcher)
150 : BleAdvertiser(adapter, 150 : BleAdvertiser(adapter,
151 base::MakeUnique<cryptauth::ForegroundEidGenerator>(), 151 base::MakeUnique<cryptauth::ForegroundEidGenerator>(),
152 remote_beacon_seed_fetcher, 152 remote_beacon_seed_fetcher,
153 local_device_data_provider) {} 153 local_device_data_provider) {}
154 154
155 BleAdvertiser::~BleAdvertiser() {} 155 BleAdvertiser::~BleAdvertiser() {}
156 156
157 BleAdvertiser::BleAdvertiser( 157 BleAdvertiser::BleAdvertiser(
158 scoped_refptr<device::BluetoothAdapter> adapter, 158 scoped_refptr<device::BluetoothAdapter> adapter,
159 std::unique_ptr<cryptauth::ForegroundEidGenerator> eid_generator, 159 std::unique_ptr<cryptauth::ForegroundEidGenerator> eid_generator,
160 const cryptauth::RemoteBeaconSeedFetcher* remote_beacon_seed_fetcher, 160 const cryptauth::RemoteBeaconSeedFetcher* remote_beacon_seed_fetcher,
161 const LocalDeviceDataProvider* local_device_data_provider) 161 const cryptauth::LocalDeviceDataProvider* local_device_data_provider)
162 : adapter_(adapter), 162 : adapter_(adapter),
163 eid_generator_(std::move(eid_generator)), 163 eid_generator_(std::move(eid_generator)),
164 remote_beacon_seed_fetcher_(remote_beacon_seed_fetcher), 164 remote_beacon_seed_fetcher_(remote_beacon_seed_fetcher),
165 local_device_data_provider_(local_device_data_provider) {} 165 local_device_data_provider_(local_device_data_provider) {}
166 166
167 bool BleAdvertiser::StartAdvertisingToDevice( 167 bool BleAdvertiser::StartAdvertisingToDevice(
168 const cryptauth::RemoteDevice& remote_device) { 168 const cryptauth::RemoteDevice& remote_device) {
169 if (device_id_to_advertisement_map_.size() >= kMaxConcurrentAdvertisements) { 169 if (device_id_to_advertisement_map_.size() >= kMaxConcurrentAdvertisements) {
170 PA_LOG(ERROR) << "Attempted to register a device when the maximum number " 170 PA_LOG(ERROR) << "Attempted to register a device when the maximum number "
171 << "of devices have already been registered."; 171 << "of devices have already been registered.";
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 } 215 }
216 216
217 bool BleAdvertiser::StopAdvertisingToDevice( 217 bool BleAdvertiser::StopAdvertisingToDevice(
218 const cryptauth::RemoteDevice& remote_device) { 218 const cryptauth::RemoteDevice& remote_device) {
219 return device_id_to_advertisement_map_.erase(remote_device.GetDeviceId()) > 0; 219 return device_id_to_advertisement_map_.erase(remote_device.GetDeviceId()) > 0;
220 } 220 }
221 221
222 } // namespace tether 222 } // namespace tether
223 223
224 } // namespace chromeos 224 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/components/tether/ble_advertiser.h ('k') | chromeos/components/tether/ble_advertiser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698