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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.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
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 CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 public input_method::InputMethodManager::Observer, 55 public input_method::InputMethodManager::Observer,
56 public policy::CloudPolicyStore::Observer, 56 public policy::CloudPolicyStore::Observer,
57 public chrome::BrowserListObserver, 57 public chrome::BrowserListObserver,
58 public extensions::AppWindowRegistry::Observer, 58 public extensions::AppWindowRegistry::Observer,
59 public user_manager::UserManager::Observer, 59 public user_manager::UserManager::Observer,
60 public user_manager::UserManager::UserSessionStateObserver, 60 public user_manager::UserManager::UserSessionStateObserver,
61 public SupervisedUserServiceObserver, 61 public SupervisedUserServiceObserver,
62 public input_method::InputMethodManager::ImeMenuObserver { 62 public input_method::InputMethodManager::ImeMenuObserver {
63 public: 63 public:
64 SystemTrayDelegateChromeOS(); 64 SystemTrayDelegateChromeOS();
65
66 ~SystemTrayDelegateChromeOS() override; 65 ~SystemTrayDelegateChromeOS() override;
67 66
68 // Completes initialization after the Bluetooth adapter is ready.
69 // TODO(jamescook): Eliminate this and just use Initialize().
70 // http://crbug.com/660043
71 void InitializeOnAdapterReady();
72
73 // Overridden from ash::SystemTrayDelegate: 67 // Overridden from ash::SystemTrayDelegate:
74 void Initialize() override; 68 void Initialize() override;
75 ash::LoginStatus GetUserLoginStatus() const override; 69 ash::LoginStatus GetUserLoginStatus() const override;
76 std::string GetEnterpriseDomain() const override; 70 std::string GetEnterpriseDomain() const override;
77 base::string16 GetEnterpriseMessage() const override; 71 base::string16 GetEnterpriseMessage() const override;
78 std::string GetSupervisedUserManager() const override; 72 std::string GetSupervisedUserManager() const override;
79 base::string16 GetSupervisedUserManagerName() const override; 73 base::string16 GetSupervisedUserManagerName() const override;
80 base::string16 GetSupervisedUserMessage() const override; 74 base::string16 GetSupervisedUserMessage() const override;
81 bool IsUserSupervised() const override; 75 bool IsUserSupervised() const override;
82 bool IsUserChild() const override; 76 bool IsUserChild() const override;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 custodian_info_changed_observers_; 217 custodian_info_changed_observers_;
224 218
225 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 219 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
226 }; 220 };
227 221
228 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 222 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
229 223
230 } // namespace chromeos 224 } // namespace chromeos
231 225
232 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 226 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698