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

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

Issue 2753313002: cros: Init SystemTrayDelegate earlier to break bluetooth init dependency (Closed)
Patch Set: fix test Created 3 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18 matching lines...) Expand all
29 struct IMEInfo; 29 struct IMEInfo;
30 struct IMEPropertyInfo; 30 struct IMEPropertyInfo;
31 31
32 class CustodianInfoTrayObserver; 32 class CustodianInfoTrayObserver;
33 class SystemTray; 33 class SystemTray;
34 class SystemTrayItem; 34 class SystemTrayItem;
35 35
36 using IMEInfoList = std::vector<IMEInfo>; 36 using IMEInfoList = std::vector<IMEInfo>;
37 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>; 37 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>;
38 38
39 // TODO(jamescook): Move to TrayBluetoothHelper. http://crbug.com/660043 39 // TODO(jamescook): Convert TrayBlueooth to use device::BluetoothDevice and
40 // delete this. http://crbug.com/660043
40 struct ASH_EXPORT BluetoothDeviceInfo { 41 struct ASH_EXPORT BluetoothDeviceInfo {
41 BluetoothDeviceInfo(); 42 BluetoothDeviceInfo();
42 BluetoothDeviceInfo(const BluetoothDeviceInfo& other); 43 BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
43 ~BluetoothDeviceInfo(); 44 ~BluetoothDeviceInfo();
44 45
45 std::string address; 46 std::string address;
46 base::string16 display_name; 47 base::string16 display_name;
47 bool connected; 48 bool connected;
48 bool connecting; 49 bool connecting;
49 bool paired; 50 bool paired;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // Creates a system tray item for display rotation lock. 199 // Creates a system tray item for display rotation lock.
199 // TODO(jamescook): Remove this when mus has support for display management 200 // TODO(jamescook): Remove this when mus has support for display management
200 // and we have a DisplayManager equivalent. See http://crbug.com/548429 201 // and we have a DisplayManager equivalent. See http://crbug.com/548429
201 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 202 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
202 SystemTray* tray); 203 SystemTray* tray);
203 }; 204 };
204 205
205 } // namespace ash 206 } // namespace ash
206 207
207 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 208 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698