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

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

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 3 years, 12 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ADAPTER_WIN_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_WIN_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_WIN_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_WIN_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 const CreateAdvertisementCallback& callback, 74 const CreateAdvertisementCallback& callback,
75 const AdvertisementErrorCallback& error_callback) override; 75 const AdvertisementErrorCallback& error_callback) override;
76 BluetoothLocalGattService* GetGattService( 76 BluetoothLocalGattService* GetGattService(
77 const std::string& identifier) const override; 77 const std::string& identifier) const override;
78 78
79 // BluetoothTaskManagerWin::Observer override 79 // BluetoothTaskManagerWin::Observer override
80 void AdapterStateChanged( 80 void AdapterStateChanged(
81 const BluetoothTaskManagerWin::AdapterState& state) override; 81 const BluetoothTaskManagerWin::AdapterState& state) override;
82 void DiscoveryStarted(bool success) override; 82 void DiscoveryStarted(bool success) override;
83 void DiscoveryStopped() override; 83 void DiscoveryStopped() override;
84 void DevicesPolled(const ScopedVector<BluetoothTaskManagerWin::DeviceState>& 84 void DevicesPolled(
85 devices) override; 85 const std::vector<std::unique_ptr<BluetoothTaskManagerWin::DeviceState>>&
86 devices) override;
86 87
87 const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner() const { 88 const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner() const {
88 return ui_task_runner_; 89 return ui_task_runner_;
89 } 90 }
90 const scoped_refptr<BluetoothSocketThread>& socket_thread() const { 91 const scoped_refptr<BluetoothSocketThread>& socket_thread() const {
91 return socket_thread_; 92 return socket_thread_;
92 } 93 }
93 94
94 scoped_refptr<BluetoothTaskManagerWin> GetWinBluetoothTaskManager() { 95 scoped_refptr<BluetoothTaskManagerWin> GetWinBluetoothTaskManager() {
95 return task_manager_; 96 return task_manager_;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // NOTE: This should remain the last member so it'll be destroyed and 162 // NOTE: This should remain the last member so it'll be destroyed and
162 // invalidate its weak pointers before any other members are destroyed. 163 // invalidate its weak pointers before any other members are destroyed.
163 base::WeakPtrFactory<BluetoothAdapterWin> weak_ptr_factory_; 164 base::WeakPtrFactory<BluetoothAdapterWin> weak_ptr_factory_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterWin); 166 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterWin);
166 }; 167 };
167 168
168 } // namespace device 169 } // namespace device
169 170
170 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_WIN_H_ 171 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698