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

Side by Side Diff: ash/system/tray/system_tray_delegate.h

Issue 1931563002: Add Bluetooth device type icons on the device list in system tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 (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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 29 matching lines...) Expand all
40 bool connected; 40 bool connected;
41 bool tray_icon_visible; 41 bool tray_icon_visible;
42 gfx::ImageSkia image; 42 gfx::ImageSkia image;
43 base::string16 name; 43 base::string16 name;
44 base::string16 description; 44 base::string16 description;
45 std::string service_path; 45 std::string service_path;
46 bool is_cellular; 46 bool is_cellular;
47 }; 47 };
48 48
49 struct ASH_EXPORT BluetoothDeviceInfo { 49 struct ASH_EXPORT BluetoothDeviceInfo {
50 enum DeviceType {
51 DEVICE_UNKNOWN,
52 DEVICE_COMPUTER,
53 DEVICE_PHONE,
54 DEVICE_MODEM,
55 DEVICE_AUDIO,
56 DEVICE_CAR_AUDIO,
57 DEVICE_VIDEO,
58 DEVICE_PERIPHERAL,
59 DEVICE_JOYSTICK,
60 DEVICE_GAMEPAD,
61 DEVICE_KEYBOARD,
62 DEVICE_MOUSE,
63 DEVICE_TABLET,
64 DEVICE_KEYBOARD_MOUSE_COMBO,
65 };
66
50 BluetoothDeviceInfo(); 67 BluetoothDeviceInfo();
68 BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
51 ~BluetoothDeviceInfo(); 69 ~BluetoothDeviceInfo();
52 70
53 std::string address; 71 std::string address;
54 base::string16 display_name; 72 base::string16 display_name;
73 DeviceType device_type;
55 bool connected; 74 bool connected;
56 bool connecting; 75 bool connecting;
57 bool paired; 76 bool paired;
58 }; 77 };
59 78
60 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; 79 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>;
61 80
62 struct ASH_EXPORT IMEPropertyInfo { 81 struct ASH_EXPORT IMEPropertyInfo {
63 IMEPropertyInfo(); 82 IMEPropertyInfo();
64 ~IMEPropertyInfo(); 83 ~IMEPropertyInfo();
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // asynchronously calls |callback| once a trusted policy becomes available. 352 // asynchronously calls |callback| once a trusted policy becomes available.
334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); 353 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback);
335 354
336 // Returns VPNDelegate. May return nullptr. 355 // Returns VPNDelegate. May return nullptr.
337 virtual VPNDelegate* GetVPNDelegate() const; 356 virtual VPNDelegate* GetVPNDelegate() const;
338 }; 357 };
339 358
340 } // namespace ash 359 } // namespace ash
341 360
342 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 361 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698