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

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

Issue 1124883004: Submission for C++ Readability (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_DEVICE_CHROMEOS_H 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
6 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H 6 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Returns the current pairing object or NULL if no pairing is in progress. 85 // Returns the current pairing object or NULL if no pairing is in progress.
86 BluetoothPairingChromeOS* GetPairing() const; 86 BluetoothPairingChromeOS* GetPairing() const;
87 87
88 // Returns the object path of the device. 88 // Returns the object path of the device.
89 const dbus::ObjectPath& object_path() const { return object_path_; } 89 const dbus::ObjectPath& object_path() const { return object_path_; }
90 90
91 // Returns the adapter which owns this device instance. 91 // Returns the adapter which owns this device instance.
92 BluetoothAdapterChromeOS* adapter() const { return adapter_; } 92 BluetoothAdapterChromeOS* adapter() const { return adapter_; }
93 93
94 protected: 94 protected:
95 // BluetoothDevice override 95 // BluetoothDevice override
omoikane 2015/05/22 23:55:28 This line should be shifted 1 space left.
Marie Janssen 2015/06/18 21:08:35 Done.
96 std::string GetDeviceName() const override; 96 std::string GetDeviceName() const override;
97 97
98 private: 98 private:
99 friend class BluetoothAdapterChromeOS; 99 friend class BluetoothAdapterChromeOS;
100 100
101 BluetoothDeviceChromeOS( 101 BluetoothDeviceChromeOS(
102 BluetoothAdapterChromeOS* adapter, 102 BluetoothAdapterChromeOS* adapter,
103 const dbus::ObjectPath& object_path, 103 const dbus::ObjectPath& object_path,
104 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 104 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
105 scoped_refptr<device::BluetoothSocketThread> socket_thread); 105 scoped_refptr<device::BluetoothSocketThread> socket_thread);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 // Note: This should remain the last member so it'll be destroyed and 191 // Note: This should remain the last member so it'll be destroyed and
192 // invalidate its weak pointers before any other members are destroyed. 192 // invalidate its weak pointers before any other members are destroyed.
193 base::WeakPtrFactory<BluetoothDeviceChromeOS> weak_ptr_factory_; 193 base::WeakPtrFactory<BluetoothDeviceChromeOS> weak_ptr_factory_;
194 194
195 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOS); 195 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOS);
196 }; 196 };
197 197
198 } // namespace chromeos 198 } // namespace chromeos
199 199
200 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H 200 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
201
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698