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

Side by Side Diff: chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h

Issue 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed ASSERT_TRUE checks. Created 8 years, 2 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 | Annotate | Revision Log
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 CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_H_ 6 #define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/callback.h"
13 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "base/string16.h" 15 #include "base/string16.h"
16 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
17 #include "chromeos/dbus/bluetooth_agent_service_provider.h" 17 #include "chromeos/dbus/bluetooth_agent_service_provider.h"
18 #include "chromeos/dbus/bluetooth_device_client.h" 18 #include "chromeos/dbus/bluetooth_device_client.h"
19 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
20 #include "dbus/object_path.h" 19 #include "dbus/object_path.h"
21 20
22 namespace chromeos { 21 namespace chromeos {
23 22
24 class BluetoothAdapter; 23 class BluetoothAdapterChromeOs;
25 class BluetoothServiceRecord; 24 class BluetoothServiceRecord;
26 class BluetoothSocket;
27 25
28 // The BluetoothDevice class represents a remote Bluetooth device, both 26 struct BluetoothOutOfBandPairingData;
29 // its properties and capabilities as discovered by a local adapter and 27
30 // actions that may be performed on the remove device such as pairing, 28 // The BluetoothDeviceChromeOs class is an implementation of BluetoothDevice
31 // connection and disconnection. 29 // for Chrome OS platform.
32 // 30 class BluetoothDeviceChromeOs : public BluetoothDevice,
33 // The class is instantiated and managed by the BluetoothAdapter class 31 public BluetoothDeviceClient::Observer,
34 // and pointers should only be obtained from that class and not cached, 32 public BluetoothAgentServiceProvider::Delegate {
35 // instead use the address() method as a unique key for a device.
36 //
37 // Since the lifecycle of BluetoothDevice instances is managed by
38 // BluetoothAdapter, that class rather than this provides observer methods
39 // for devices coming and going, as well as properties being updated.
40 class BluetoothDevice : public BluetoothDeviceClient::Observer,
41 public BluetoothAgentServiceProvider::Delegate {
42 public: 33 public:
43 // Possible values that may be returned by GetDeviceType(), representing 34 virtual ~BluetoothDeviceChromeOs();
44 // different types of bluetooth device that we support or are aware of
45 // decoded from the bluetooth class information.
46 enum DeviceType {
47 DEVICE_UNKNOWN,
48 DEVICE_COMPUTER,
49 DEVICE_PHONE,
50 DEVICE_MODEM,
51 DEVICE_PERIPHERAL,
52 DEVICE_JOYSTICK,
53 DEVICE_GAMEPAD,
54 DEVICE_KEYBOARD,
55 DEVICE_MOUSE,
56 DEVICE_TABLET,
57 DEVICE_KEYBOARD_MOUSE_COMBO
58 };
59 35
60 // Interface for observing changes from bluetooth devices. 36 // BluetoothDevice override
61 class Observer { 37 virtual bool IsPaired() const OVERRIDE;
62 public: 38 virtual const ServiceList& GetServices() const OVERRIDE;
63 virtual ~Observer() {} 39 virtual void GetServiceRecords(
40 const ServiceRecordsCallback& callback,
41 const ErrorCallback& error_callback) OVERRIDE;
42 virtual bool ProvidesServiceWithUUID(const std::string& uuid) const OVERRIDE;
43 virtual void ProvidesServiceWithName(
44 const std::string& name,
45 const ProvidesServiceCallback& callback) OVERRIDE;
46 virtual bool ExpectingPinCode() const OVERRIDE;
47 virtual bool ExpectingPasskey() const OVERRIDE;
48 virtual bool ExpectingConfirmation() const OVERRIDE;
49 virtual void Connect(
50 BluetoothDevice::PairingDelegate* pairing_delegate,
51 const base::Closure& callback,
52 const ErrorCallback& error_callback) OVERRIDE;
53 virtual void SetPinCode(const std::string& pincode) OVERRIDE;
54 virtual void SetPasskey(uint32 passkey) OVERRIDE;
55 virtual void ConfirmPairing() OVERRIDE;
56 virtual void RejectPairing() OVERRIDE;
57 virtual void CancelPairing() OVERRIDE;
58 virtual void Disconnect(
59 const base::Closure& callback,
60 const ErrorCallback& error_callback) OVERRIDE;
61 virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
62 virtual void ConnectToService(
63 const std::string& service_uuid,
64 const SocketCallback& callback) OVERRIDE;
65 virtual void SetOutOfBandPairingData(
66 const chromeos::BluetoothOutOfBandPairingData& data,
67 const base::Closure& callback,
68 const ErrorCallback& error_callback) OVERRIDE;
69 virtual void ClearOutOfBandPairingData(
70 const base::Closure& callback,
71 const ErrorCallback& error_callback) OVERRIDE;
64 72
65 // TODO(keybuk): add observers for pairing and connection. 73 private:
66 }; 74 friend class BluetoothAdapterChromeOs;
75 friend class MockBluetoothDevice;
67 76
68 // Interface for negotiating pairing of bluetooth devices. 77 explicit BluetoothDeviceChromeOs(BluetoothAdapterChromeOs* adapter);
69 class PairingDelegate {
70 public:
71 virtual ~PairingDelegate() {}
72
73 // This method will be called when the Bluetooth daemon requires a
74 // PIN Code for authentication of the device |device|, the delegate should
75 // obtain the code from the user and call SetPinCode() on the device to
76 // provide it, or RejectPairing() or CancelPairing() to reject or cancel
77 // the request.
78 //
79 // PIN Codes are generally required for Bluetooth 2.0 and earlier devices
80 // for which there is no automatic pairing or special handling.
81 virtual void RequestPinCode(BluetoothDevice* device) = 0;
82
83 // This method will be called when the Bluetooth daemon requires a
84 // Passkey for authentication of the device |device|, the delegate should
85 // obtain the passkey from the user (a numeric in the range 0-999999) and
86 // call SetPasskey() on the device to provide it, or RejectPairing() or
87 // CancelPairing() to reject or cancel the request.
88 //
89 // Passkeys are generally required for Bluetooth 2.1 and later devices
90 // which cannot provide input or display on their own, and don't accept
91 // passkey-less pairing.
92 virtual void RequestPasskey(BluetoothDevice* device) = 0;
93
94 // This method will be called when the Bluetooth daemon requires that the
95 // user enter the PIN code |pincode| into the device |device| so that it
96 // may be authenticated. The DismissDisplayOrConfirm() method
97 // will be called to dismiss the display once pairing is complete or
98 // cancelled.
99 //
100 // This is used for Bluetooth 2.0 and earlier keyboard devices, the
101 // |pincode| will always be a six-digit numeric in the range 000000-999999
102 // for compatibilty with later specifications.
103 virtual void DisplayPinCode(BluetoothDevice* device,
104 const std::string& pincode) = 0;
105
106 // This method will be called when the Bluetooth daemon requires that the
107 // user enter the Passkey |passkey| into the device |device| so that it
108 // may be authenticated. The DismissDisplayOrConfirm() method will be
109 // called to dismiss the display once pairing is complete or cancelled.
110 //
111 // This is used for Bluetooth 2.1 and later devices that support input
112 // but not display, such as keyboards. The Passkey is a numeric in the
113 // range 0-999999 and should be always presented zero-padded to six
114 // digits.
115 virtual void DisplayPasskey(BluetoothDevice* device,
116 uint32 passkey) = 0;
117
118 // This method will be called when the Bluetooth daemon requires that the
119 // user confirm that the Passkey |passkey| is displayed on the screen
120 // of the device |device| so that it may be authenticated. The delegate
121 // should display to the user and ask for confirmation, then call
122 // ConfirmPairing() on the device to confirm, RejectPairing() on the device
123 // to reject or CancelPairing() on the device to cancel authentication
124 // for any other reason.
125 //
126 // This is used for Bluetooth 2.1 and later devices that support display,
127 // such as other computers or phones. The Passkey is a numeric in the
128 // range 0-999999 and should be always present zero-padded to six
129 // digits.
130 virtual void ConfirmPasskey(BluetoothDevice* device,
131 uint32 passkey) = 0;
132
133 // This method will be called when any previous DisplayPinCode(),
134 // DisplayPasskey() or ConfirmPasskey() request should be concluded
135 // and removed from the user.
136 virtual void DismissDisplayOrConfirm() = 0;
137 };
138
139 virtual ~BluetoothDevice();
140
141 // Returns the Bluetooth of address the device. This should be used as
142 // a unique key to identify the device and copied where needed.
143 virtual const std::string& address() const;
144
145 // Returns the name of the device suitable for displaying, this may
146 // be a synthesied string containing the address and localized type name
147 // if the device has no obtained name.
148 virtual string16 GetName() const;
149
150 // Returns the type of the device, limited to those we support or are
151 // aware of, by decoding the bluetooth class information. The returned
152 // values are unique, and do not overlap, so DEVICE_KEYBOARD is not also
153 // DEVICE_PERIPHERAL.
154 DeviceType GetDeviceType() const;
155
156 // Returns a localized string containing the device's bluetooth address and
157 // a device type for display when |name_| is empty.
158 string16 GetAddressWithLocalizedDeviceTypeName() const;
159 78
160 // Indicates whether the class of this device is supported by Chrome OS. 79 // Indicates whether the class of this device is supported by Chrome OS.
161 bool IsSupported() const; 80 bool IsSupported() const;
162 81
163 // Indicates whether the device is paired to the adapter, whether or not
164 // that pairing is permanent or temporary.
165 virtual bool IsPaired() const;
166
167 // Indicates whether the device is visible to the adapter, this is not
168 // mutually exclusive to being paired.
169 bool IsVisible() const { return visible_; }
170
171 // Indicates whether the device is bonded to the adapter, bonding is
172 // formed by pairing and exchanging high-security link keys so that
173 // connections may be encrypted.
174 virtual bool IsBonded() const;
175
176 // Indicates whether the device is currently connected to the adapter
177 // and at least one service available for use.
178 virtual bool IsConnected() const;
179
180 // Returns the services (as UUID strings) that this device provides.
181 typedef std::vector<std::string> ServiceList;
182 const ServiceList& GetServices() const { return service_uuids_; }
183
184 // The ErrorCallback is used for methods that can fail in which case it
185 // is called, in the success case the callback is simply not called.
186 typedef base::Callback<void()> ErrorCallback;
187
188 // Returns the services (as BluetoothServiceRecord objects) that this device
189 // provides.
190 typedef ScopedVector<BluetoothServiceRecord> ServiceRecordList;
191 typedef base::Callback<void(const ServiceRecordList&)> ServiceRecordsCallback;
192 void GetServiceRecords(const ServiceRecordsCallback& callback,
193 const ErrorCallback& error_callback);
194
195 // Indicates whether this device provides the given service. |uuid| should
196 // be in canonical form (see bluetooth_utils::CanonicalUuid).
197 virtual bool ProvidesServiceWithUUID(const std::string& uuid) const;
198
199 // The ProvidesServiceCallback is used by ProvidesServiceWithName to indicate
200 // whether or not a matching service was found.
201 typedef base::Callback<void(bool)> ProvidesServiceCallback;
202
203 // Indicates whether this device provides the given service.
204 virtual void ProvidesServiceWithName(const std::string& name,
205 const ProvidesServiceCallback& callback);
206
207 // Indicates whether the device is currently pairing and expecting a
208 // PIN Code to be returned.
209 bool ExpectingPinCode() const { return !pincode_callback_.is_null(); }
210
211 // Indicates whether the device is currently pairing and expecting a
212 // Passkey to be returned.
213 bool ExpectingPasskey() const { return !passkey_callback_.is_null(); }
214
215 // Indicates whether the device is currently pairing and expecting
216 // confirmation of a displayed passkey.
217 bool ExpectingConfirmation() const {
218 return !confirmation_callback_.is_null();
219 }
220
221 // Initiates a connection to the device, pairing first if necessary.
222 //
223 // Method calls will be made on the supplied object |pairing_delegate|
224 // to indicate what display, and in response should make method calls
225 // back to the device object. Not all devices require user responses
226 // during pairing, so it is normal for |pairing_delegate| to receive no
227 // calls. To explicitly force a low-security connection without bonding,
228 // pass NULL, though this is ignored if the device is already paired.
229 //
230 // If the request fails, |error_callback| will be called; otherwise,
231 // |callback| is called when the request is complete.
232 void Connect(PairingDelegate* pairing_delegate,
233 const base::Closure& callback,
234 const ErrorCallback& error_callback);
235
236 // Sends the PIN code |pincode| to the remote device during pairing.
237 //
238 // PIN Codes are generally required for Bluetooth 2.0 and earlier devices
239 // for which there is no automatic pairing or special handling.
240 void SetPinCode(const std::string& pincode);
241
242 // Sends the Passkey |passkey| to the remote device during pairing.
243 //
244 // Passkeys are generally required for Bluetooth 2.1 and later devices
245 // which cannot provide input or display on their own, and don't accept
246 // passkey-less pairing, and are a numeric in the range 0-999999.
247 void SetPasskey(uint32 passkey);
248
249 // Confirms to the remote device during pairing that a passkey provided by
250 // the ConfirmPasskey() delegate call is displayed on both devices.
251 void ConfirmPairing();
252
253 // Rejects a pairing or connection request from a remote device.
254 void RejectPairing();
255
256 // Cancels a pairing or connection attempt to a remote device.
257 void CancelPairing();
258
259 // Disconnects the device, terminating the low-level ACL connection
260 // and any application connections using it. Link keys and other pairing
261 // information are not discarded, and the device object is not deleted.
262 // If the request fails, |error_callback| will be called; otherwise,
263 // |callback| is called when the request is complete.
264 void Disconnect(const base::Closure& callback,
265 const ErrorCallback& error_callback);
266
267 // Disconnects the device, terminating the low-level ACL connection
268 // and any application connections using it, and then discards link keys
269 // and other pairing information. The device object remainds valid until
270 // returing from the calling function, after which it should be assumed to
271 // have been deleted. If the request fails, |error_callback| will be called.
272 // There is no callback for success beause this object is often deleted
273 // before that callback would be called.
274 void Forget(const ErrorCallback& error_callback);
275
276 // SocketCallback is used by ConnectToService to return a BluetoothSocket
277 // to the caller, or NULL if there was an error. The socket will remain open
278 // until the last reference to the returned BluetoothSocket is released.
279 typedef base::Callback<void(scoped_refptr<BluetoothSocket>)> SocketCallback;
280
281 // Attempts to open a socket to a service matching |uuid| on this device. If
282 // the connection is successful, |callback| is called with a BluetoothSocket.
283 // Otherwise |callback| is called with NULL. The socket is closed as soon as
284 // all references to the BluetoothSocket are released. Note that the
285 // BluetoothSocket object can outlive both this BluetoothDevice and the
286 // BluetoothAdapter for this device.
287 void ConnectToService(const std::string& service_uuid,
288 const SocketCallback& callback);
289
290 // Sets the Out Of Band pairing data for this device to |data|. Exactly one
291 // of |callback| or |error_callback| will be run.
292 virtual void SetOutOfBandPairingData(
293 const chromeos::BluetoothOutOfBandPairingData& data,
294 const base::Closure& callback,
295 const ErrorCallback& error_callback);
296
297 // Clears the Out Of Band pairing data for this device. Exactly one of
298 // |callback| or |error_callback| will be run.
299 virtual void ClearOutOfBandPairingData(
300 const base::Closure& callback,
301 const ErrorCallback& error_callback);
302
303 private:
304 friend class BluetoothAdapter;
305 friend class MockBluetoothDevice;
306
307 explicit BluetoothDevice(BluetoothAdapter* adapter);
308
309 // Sets the dbus object path for the device to |object_path|, indicating 82 // Sets the dbus object path for the device to |object_path|, indicating
310 // that the device has gone from being discovered to paired or bonded. 83 // that the device has gone from being discovered to paired or bonded.
311 void SetObjectPath(const dbus::ObjectPath& object_path); 84 void SetObjectPath(const dbus::ObjectPath& object_path);
312 85
313 // Removes the dbus object path from the device, indicating that the 86 // Removes the dbus object path from the device, indicating that the
314 // device is no longer paired or bonded, but perhaps still visible. 87 // device is no longer paired or bonded, but perhaps still visible.
315 void RemoveObjectPath(); 88 void RemoveObjectPath();
316 89
317 // Sets whether the device is visible to the owning adapter to |visible|. 90 // Sets whether the device is visible to the owning adapter to |visible|.
318 void SetVisible(bool visible) { visible_ = visible; } 91 void SetVisible(bool visible) { visible_ = visible; }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 const std::string& error_message); 168 const std::string& error_message);
396 169
397 // Called by BluetoothDeviceClient when a call to Disconnect() completes, 170 // Called by BluetoothDeviceClient when a call to Disconnect() completes,
398 // |success| indicates whether or not the request succeeded, |callback| and 171 // |success| indicates whether or not the request succeeded, |callback| and
399 // |error_callback| are the callbacks provided to Disconnect() and 172 // |error_callback| are the callbacks provided to Disconnect() and
400 // |device_path| is the device disconnected. 173 // |device_path| is the device disconnected.
401 void DisconnectCallback(const base::Closure& callback, 174 void DisconnectCallback(const base::Closure& callback,
402 const ErrorCallback& error_callback, 175 const ErrorCallback& error_callback,
403 const dbus::ObjectPath& device_path, bool success); 176 const dbus::ObjectPath& device_path, bool success);
404 177
405 // Called by BluetoothAdapterClient when a call to RemoveDevice() completes, 178 // Called by BluetoothAdapterClient when a call to RemoveDevice()
406 // |success| indicates whether or not the request succeeded, |error_callback| 179 // completes, |success| indicates whether or not the request succeeded,
407 // is the callback provided to Forget() and |adapter_path| is the d-bus 180 // |error_callback| is the callback provided to Forget() and |adapter_path| is
408 // object path of the adapter that performed the removal. 181 // the d-bus object path of the adapter that performed the removal.
409 void ForgetCallback(const ErrorCallback& error_callback, 182 void ForgetCallback(const ErrorCallback& error_callback,
410 const dbus::ObjectPath& adapter_path, bool success); 183 const dbus::ObjectPath& adapter_path, bool success);
411 184
412 // Called if the call to GetServiceRecords from ProvidesServiceWithName fails. 185 // Called if the call to GetServiceRecords from ProvidesServiceWithName fails.
413 void SearchServicesForNameErrorCallback( 186 void SearchServicesForNameErrorCallback(
414 const ProvidesServiceCallback& callback); 187 const ProvidesServiceCallback& callback);
415 188
416 // Called by GetServiceRecords with the list of BluetoothServiceRecords to 189 // Called by GetServiceRecords with the list of BluetoothServiceRecords to
417 // search for |name|. |callback| is the callback from 190 // search for |name|. |callback| is the callback from
418 // ProvidesServiceWithName. 191 // ProvidesServiceWithName.
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 // their response (success, rejected or cancelled). 320 // their response (success, rejected or cancelled).
548 virtual void ConfirmModeChange(Mode mode, 321 virtual void ConfirmModeChange(Mode mode,
549 const ConfirmationCallback& callback) OVERRIDE; 322 const ConfirmationCallback& callback) OVERRIDE;
550 323
551 // BluetoothAgentServiceProvider::Delegate override. 324 // BluetoothAgentServiceProvider::Delegate override.
552 // 325 //
553 // This method will be called by the Bluetooth daemon to indicate that 326 // This method will be called by the Bluetooth daemon to indicate that
554 // the request failed before a reply was returned from the device. 327 // the request failed before a reply was returned from the device.
555 virtual void Cancel() OVERRIDE; 328 virtual void Cancel() OVERRIDE;
556 329
557 // Creates a new BluetoothDevice object bound to the adapter |adapter|. 330 // Creates a new BluetoothDeviceChromeOs object bound to the adapter
558 static BluetoothDevice* Create(BluetoothAdapter* adapter); 331 // |adapter|.
332 static BluetoothDeviceChromeOs* Create(BluetoothAdapterChromeOs* adapter);
559 333
560 // The adapter that owns this device instance. 334 // The adapter that owns this device instance.
561 BluetoothAdapter* adapter_; 335 BluetoothAdapterChromeOs* adapter_;
562 336
563 // The dbus object path of the device, will be empty if the device has only 337 // The dbus object path of the device, will be empty if the device has only
564 // been discovered and not yet paired with. 338 // been discovered and not yet paired with.
565 dbus::ObjectPath object_path_; 339 dbus::ObjectPath object_path_;
566 340
567 // The Bluetooth address of the device.
568 std::string address_;
569
570 // The name of the device, as supplied by the remote device.
571 std::string name_;
572
573 // The Bluetooth class of the device, a bitmask that may be decoded using
574 // https://www.bluetooth.org/Technical/AssignedNumbers/baseband.htm
575 uint32 bluetooth_class_;
576
577 // Tracked device state, updated by the adapter managing the lifecyle of
578 // the device.
579 bool visible_;
580 bool bonded_;
581 bool connected_;
582
583 // The services (identified by UUIDs) that this device provides. 341 // The services (identified by UUIDs) that this device provides.
584 std::vector<std::string> service_uuids_; 342 std::vector<std::string> service_uuids_;
585 343
586 // During pairing this is set to an object that we don't own, but on which 344 // During pairing this is set to an object that we don't own, but on which
587 // we can make method calls to request, display or confirm PIN Codes and 345 // we can make method calls to request, display or confirm PIN Codes and
588 // Passkeys. Generally it is the object that owns this one. 346 // Passkeys. Generally it is the object that owns this one.
589 PairingDelegate* pairing_delegate_; 347 BluetoothDevice::PairingDelegate* pairing_delegate_;
590 348
591 // During pairing this is set to an instance of a D-Bus agent object 349 // During pairing this is set to an instance of a D-Bus agent object
592 // intialized with our own class as its delegate. 350 // intialized with our own class as its delegate.
593 scoped_ptr<BluetoothAgentServiceProvider> agent_; 351 scoped_ptr<BluetoothAgentServiceProvider> agent_;
594 352
595 // During pairing these callbacks are set to those provided by method calls 353 // During pairing these callbacks are set to those provided by method calls
596 // made on us by |agent_| and are called by our own method calls such as 354 // made on us by |agent_| and are called by our own method calls such as
597 // SetPinCode() and SetPasskey(). 355 // SetPinCode() and SetPasskey().
598 PinCodeCallback pincode_callback_; 356 PinCodeCallback pincode_callback_;
599 PasskeyCallback passkey_callback_; 357 PasskeyCallback passkey_callback_;
600 ConfirmationCallback confirmation_callback_; 358 ConfirmationCallback confirmation_callback_;
601 359
602 // Used to keep track of pending application connection requests. 360 // Used to keep track of pending application connection requests.
603 int connecting_applications_counter_; 361 int connecting_applications_counter_;
604 362
605 // Note: This should remain the last member so it'll be destroyed and 363 // Note: This should remain the last member so it'll be destroyed and
606 // invalidate its weak pointers before any other members are destroyed. 364 // invalidate its weak pointers before any other members are destroyed.
607 base::WeakPtrFactory<BluetoothDevice> weak_ptr_factory_; 365 base::WeakPtrFactory<BluetoothDeviceChromeOs> weak_ptr_factory_;
608 366
609 DISALLOW_COPY_AND_ASSIGN(BluetoothDevice); 367 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOs);
610 }; 368 };
611 369
612 } // namespace chromeos 370 } // namespace chromeos
613 371
614 #endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_H_ 372 #endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('k') | chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698