OLD | NEW |
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 ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 29 matching lines...) Expand all Loading... |
40 bool is_cellular; | 40 bool is_cellular; |
41 }; | 41 }; |
42 | 42 |
43 struct ASH_EXPORT BluetoothDeviceInfo { | 43 struct ASH_EXPORT BluetoothDeviceInfo { |
44 BluetoothDeviceInfo(); | 44 BluetoothDeviceInfo(); |
45 ~BluetoothDeviceInfo(); | 45 ~BluetoothDeviceInfo(); |
46 | 46 |
47 std::string address; | 47 std::string address; |
48 base::string16 display_name; | 48 base::string16 display_name; |
49 bool connected; | 49 bool connected; |
| 50 bool connecting; |
50 bool paired; | 51 bool paired; |
51 }; | 52 }; |
52 | 53 |
53 typedef std::vector<BluetoothDeviceInfo> BluetoothDeviceList; | 54 typedef std::vector<BluetoothDeviceInfo> BluetoothDeviceList; |
54 | 55 |
55 // Structure that packs progress information of each operation. | 56 // Structure that packs progress information of each operation. |
56 struct ASH_EXPORT DriveOperationStatus { | 57 struct ASH_EXPORT DriveOperationStatus { |
57 enum OperationType { | 58 enum OperationType { |
58 OPERATION_UPLOAD, | 59 OPERATION_UPLOAD, |
59 OPERATION_DOWNLOAD, | 60 OPERATION_DOWNLOAD, |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 // Speaks the given text if spoken feedback is enabled. | 363 // Speaks the given text if spoken feedback is enabled. |
363 virtual void MaybeSpeak(const std::string& utterance) const = 0; | 364 virtual void MaybeSpeak(const std::string& utterance) const = 0; |
364 | 365 |
365 // Creates a dummy delegate for testing. | 366 // Creates a dummy delegate for testing. |
366 static SystemTrayDelegate* CreateDummyDelegate(); | 367 static SystemTrayDelegate* CreateDummyDelegate(); |
367 }; | 368 }; |
368 | 369 |
369 } // namespace ash | 370 } // namespace ash |
370 | 371 |
371 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 372 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
OLD | NEW |