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

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

Issue 2381493005: Add bluetooth device type icons on MD system tray. (Closed)
Patch Set: Add depencency //ui/gfx/vector_icons:vector_icons to //ash:ash Created 4 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
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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_COMMON_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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 bool tray_icon_visible; 48 bool tray_icon_visible;
49 gfx::ImageSkia image; 49 gfx::ImageSkia image;
50 base::string16 name; 50 base::string16 name;
51 base::string16 description; 51 base::string16 description;
52 std::string service_path; 52 std::string service_path;
53 bool is_cellular; 53 bool is_cellular;
54 }; 54 };
55 55
56 struct ASH_EXPORT BluetoothDeviceInfo { 56 struct ASH_EXPORT BluetoothDeviceInfo {
57 BluetoothDeviceInfo(); 57 BluetoothDeviceInfo();
58 BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
58 ~BluetoothDeviceInfo(); 59 ~BluetoothDeviceInfo();
59 60
60 std::string address; 61 std::string address;
61 base::string16 display_name; 62 base::string16 display_name;
63 gfx::ImageSkia icon_image;
62 bool connected; 64 bool connected;
63 bool connecting; 65 bool connecting;
64 bool paired; 66 bool paired;
65 }; 67 };
66 68
67 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; 69 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>;
68 70
69 struct ASH_EXPORT UpdateInfo { 71 struct ASH_EXPORT UpdateInfo {
70 enum UpdateSeverity { 72 enum UpdateSeverity {
71 UPDATE_NONE, 73 UPDATE_NONE,
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // Creates a system tray item for display rotation lock. 321 // Creates a system tray item for display rotation lock.
320 // TODO(jamescook): Remove this when mus has support for display management 322 // TODO(jamescook): Remove this when mus has support for display management
321 // and we have a DisplayManager equivalent. See http://crbug.com/548429 323 // and we have a DisplayManager equivalent. See http://crbug.com/548429
322 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 324 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
323 SystemTray* tray); 325 SystemTray* tray);
324 }; 326 };
325 327
326 } // namespace ash 328 } // namespace ash
327 329
328 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 330 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/bluetooth/tray_bluetooth.cc ('k') | ash/common/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698