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

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

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)
Patch Set: Created 4 years, 1 month 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 <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/accessibility_types.h" 13 #include "ash/common/accessibility_types.h"
14 #include "ash/common/session/session_state_observer.h" 14 #include "ash/common/session/session_state_observer.h"
15 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h" 15 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
16 #include "ash/common/system/tray/ime_info.h" 16 #include "ash/common/system/tray/ime_info.h"
17 #include "ash/common/system/tray/system_tray.h"
18 #include "ash/common/system/tray/system_tray_delegate.h" 17 #include "ash/common/system/tray/system_tray_delegate.h"
19 #include "base/callback_forward.h" 18 #include "base/callback_forward.h"
20 #include "base/callback_list.h" 19 #include "base/callback_list.h"
21 #include "base/compiler_specific.h" 20 #include "base/compiler_specific.h"
22 #include "base/macros.h" 21 #include "base/macros.h"
23 #include "base/memory/ref_counted.h" 22 #include "base/memory/ref_counted.h"
24 #include "base/memory/weak_ptr.h" 23 #include "base/memory/weak_ptr.h"
25 #include "base/observer_list.h" 24 #include "base/observer_list.h"
26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 25 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
27 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" 26 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 base::string16 GetSupervisedUserManagerName() const override; 86 base::string16 GetSupervisedUserManagerName() const override;
88 base::string16 GetSupervisedUserMessage() const override; 87 base::string16 GetSupervisedUserMessage() const override;
89 bool IsUserSupervised() const override; 88 bool IsUserSupervised() const override;
90 bool IsUserChild() const override; 89 bool IsUserChild() const override;
91 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override; 90 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
92 bool ShouldShowSettings() override; 91 bool ShouldShowSettings() override;
93 void ShowEnterpriseInfo() override; 92 void ShowEnterpriseInfo() override;
94 void ShowUserLogin() override; 93 void ShowUserLogin() override;
95 void SignOut() override; 94 void SignOut() override;
96 void RequestRestartForUpdate() override; 95 void RequestRestartForUpdate() override;
97 void RequestShutdown() override;
98 void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override; 96 void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override;
99 void BluetoothStartDiscovering() override; 97 void BluetoothStartDiscovering() override;
100 void BluetoothStopDiscovering() override; 98 void BluetoothStopDiscovering() override;
101 void ConnectToBluetoothDevice(const std::string& address) override; 99 void ConnectToBluetoothDevice(const std::string& address) override;
102 bool IsBluetoothDiscovering() override; 100 bool IsBluetoothDiscovering() override;
103 void GetCurrentIME(ash::IMEInfo* info) override; 101 void GetCurrentIME(ash::IMEInfo* info) override;
104 void GetAvailableIMEList(ash::IMEInfoList* list) override; 102 void GetAvailableIMEList(ash::IMEInfoList* list) override;
105 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 103 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
106 void SwitchIME(const std::string& ime_id) override; 104 void SwitchIME(const std::string& ime_id) override;
107 void ActivateIMEProperty(const std::string& key) override; 105 void ActivateIMEProperty(const std::string& key) override;
(...skipping 23 matching lines...) Expand all
131 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( 129 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
132 ash::SystemTray* tray) override; 130 ash::SystemTray* tray) override;
133 131
134 // Overridden from user_manager::UserManager::UserSessionStateObserver: 132 // Overridden from user_manager::UserManager::UserSessionStateObserver:
135 void UserAddedToSession(const user_manager::User* active_user) override; 133 void UserAddedToSession(const user_manager::User* active_user) override;
136 void ActiveUserChanged(const user_manager::User* active_user) override; 134 void ActiveUserChanged(const user_manager::User* active_user) override;
137 135
138 void UserChangedChildStatus(user_manager::User* user) override; 136 void UserChangedChildStatus(user_manager::User* user) override;
139 137
140 private: 138 private:
141 ash::SystemTray* GetPrimarySystemTray();
142
143 ash::SystemTrayNotifier* GetSystemTrayNotifier(); 139 ash::SystemTrayNotifier* GetSystemTrayNotifier();
144 140
145 void SetProfile(Profile* profile); 141 void SetProfile(Profile* profile);
146 142
147 bool UnsetProfile(Profile* profile); 143 bool UnsetProfile(Profile* profile);
148 144
149 void UpdateShowLogoutButtonInTray(); 145 void UpdateShowLogoutButtonInTray();
150 146
151 void UpdateLogoutDialogDuration(); 147 void UpdateLogoutDialogDuration();
152 148
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 275
280 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 276 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
281 277
282 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 278 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
283 }; 279 };
284 280
285 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 281 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
286 282
287 } // namespace chromeos 283 } // namespace chromeos
288 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 284 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698