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

Side by Side Diff: chromeos/components/tether/ble_scanner.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_scanner.h" 5 #include "chromeos/components/tether/ble_scanner.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chromeos/components/tether/ble_constants.h" 10 #include "chromeos/components/tether/ble_constants.h"
(...skipping 28 matching lines...) Expand all
39 39
40 const std::vector<uint8_t>* 40 const std::vector<uint8_t>*
41 BleScanner::ServiceDataProviderImpl::GetServiceDataForUUID( 41 BleScanner::ServiceDataProviderImpl::GetServiceDataForUUID(
42 device::BluetoothDevice* bluetooth_device) { 42 device::BluetoothDevice* bluetooth_device) {
43 return bluetooth_device->GetServiceDataForUUID( 43 return bluetooth_device->GetServiceDataForUUID(
44 device::BluetoothUUID(kAdvertisingServiceUuid)); 44 device::BluetoothUUID(kAdvertisingServiceUuid));
45 } 45 }
46 46
47 BleScanner::BleScanner( 47 BleScanner::BleScanner(
48 scoped_refptr<device::BluetoothAdapter> adapter, 48 scoped_refptr<device::BluetoothAdapter> adapter,
49 const LocalDeviceDataProvider* local_device_data_provider) 49 const cryptauth::LocalDeviceDataProvider* local_device_data_provider)
50 : BleScanner(base::MakeUnique<ServiceDataProviderImpl>(), 50 : BleScanner(base::MakeUnique<ServiceDataProviderImpl>(),
51 adapter, 51 adapter,
52 base::WrapUnique(new cryptauth::ForegroundEidGenerator()), 52 base::WrapUnique(new cryptauth::ForegroundEidGenerator()),
53 local_device_data_provider) {} 53 local_device_data_provider) {}
54 54
55 BleScanner::BleScanner( 55 BleScanner::BleScanner(
56 std::unique_ptr<ServiceDataProvider> service_data_provider, 56 std::unique_ptr<ServiceDataProvider> service_data_provider,
57 scoped_refptr<device::BluetoothAdapter> adapter, 57 scoped_refptr<device::BluetoothAdapter> adapter,
58 std::unique_ptr<cryptauth::ForegroundEidGenerator> eid_generator, 58 std::unique_ptr<cryptauth::ForegroundEidGenerator> eid_generator,
59 const LocalDeviceDataProvider* local_device_data_provider) 59 const cryptauth::LocalDeviceDataProvider* local_device_data_provider)
60 : service_data_provider_(std::move(service_data_provider)), 60 : service_data_provider_(std::move(service_data_provider)),
61 adapter_(adapter), 61 adapter_(adapter),
62 eid_generator_(std::move(eid_generator)), 62 eid_generator_(std::move(eid_generator)),
63 local_device_data_provider_(local_device_data_provider), 63 local_device_data_provider_(local_device_data_provider),
64 is_initializing_discovery_session_(false), 64 is_initializing_discovery_session_(false),
65 discovery_session_(nullptr), 65 discovery_session_(nullptr),
66 weak_ptr_factory_(this) { 66 weak_ptr_factory_(this) {
67 adapter_->AddObserver(this); 67 adapter_->AddObserver(this);
68 } 68 }
69 69
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 254
255 for (auto& observer : observer_list_) { 255 for (auto& observer : observer_list_) {
256 observer.OnReceivedAdvertisementFromDevice(bluetooth_device->GetAddress(), 256 observer.OnReceivedAdvertisementFromDevice(bluetooth_device->GetAddress(),
257 *identified_device); 257 *identified_device);
258 } 258 }
259 } 259 }
260 260
261 } // namespace tether 261 } // namespace tether
262 262
263 } // namespace chromeos 263 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/components/tether/ble_scanner.h ('k') | chromeos/components/tether/ble_scanner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698