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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 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 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 29 matching lines...) Expand all
40 public input_method::InputMethodManager::Observer, 40 public input_method::InputMethodManager::Observer,
41 public chrome::BrowserListObserver, 41 public chrome::BrowserListObserver,
42 public extensions::AppWindowRegistry::Observer, 42 public extensions::AppWindowRegistry::Observer,
43 public input_method::InputMethodManager::ImeMenuObserver { 43 public input_method::InputMethodManager::ImeMenuObserver {
44 public: 44 public:
45 SystemTrayDelegateChromeOS(); 45 SystemTrayDelegateChromeOS();
46 ~SystemTrayDelegateChromeOS() override; 46 ~SystemTrayDelegateChromeOS() override;
47 47
48 // Overridden from ash::SystemTrayDelegate: 48 // Overridden from ash::SystemTrayDelegate:
49 void Initialize() override; 49 void Initialize() override;
50 ash::LoginStatus GetUserLoginStatus() const override;
51 void ShowUserLogin() override; 50 void ShowUserLogin() override;
52 void GetCurrentIME(ash::IMEInfo* info) override; 51 void GetCurrentIME(ash::IMEInfo* info) override;
53 void GetAvailableIMEList(ash::IMEInfoList* list) override; 52 void GetAvailableIMEList(ash::IMEInfoList* list) override;
54 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 53 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
55 base::string16 GetIMEManagedMessage() override; 54 base::string16 GetIMEManagedMessage() override;
56 void SwitchIME(const std::string& ime_id) override; 55 void SwitchIME(const std::string& ime_id) override;
57 void ActivateIMEProperty(const std::string& key) override; 56 void ActivateIMEProperty(const std::string& key) override;
58 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 57 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
59 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 58 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
60 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 59 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 136 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
138 137
139 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 138 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
140 }; 139 };
141 140
142 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 141 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
143 142
144 } // namespace chromeos 143 } // namespace chromeos
145 144
146 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 145 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_controller.cc ('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