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

Side by Side Diff: ash/system/tray/system_tray_delegate.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
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/system_tray_delegate.cc » ('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_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_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>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/login_status.h"
14 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
15 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
16 #include "base/i18n/time_formatting.h" 15 #include "base/i18n/time_formatting.h"
17 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
18 17
19 namespace base { 18 namespace base {
20 class TimeDelta; 19 class TimeDelta;
21 class TimeTicks; 20 class TimeTicks;
22 } 21 }
23 22
(...skipping 17 matching lines...) Expand all
41 // DEPRECATED: This class is being replaced with SystemTrayController and 40 // DEPRECATED: This class is being replaced with SystemTrayController and
42 // SessionController to support mash/mustash. Add new code to those classes. 41 // SessionController to support mash/mustash. Add new code to those classes.
43 class ASH_EXPORT SystemTrayDelegate { 42 class ASH_EXPORT SystemTrayDelegate {
44 public: 43 public:
45 SystemTrayDelegate(); 44 SystemTrayDelegate();
46 virtual ~SystemTrayDelegate(); 45 virtual ~SystemTrayDelegate();
47 46
48 // Called after SystemTray has been instantiated. 47 // Called after SystemTray has been instantiated.
49 virtual void Initialize(); 48 virtual void Initialize();
50 49
51 // Gets information about the active user.
52 virtual LoginStatus GetUserLoginStatus() const;
53
54 // Shows login UI to add other users to this session. 50 // Shows login UI to add other users to this session.
55 virtual void ShowUserLogin(); 51 virtual void ShowUserLogin();
56 52
57 // Returns the currently selected IME. 53 // Returns the currently selected IME.
58 virtual void GetCurrentIME(IMEInfo* info); 54 virtual void GetCurrentIME(IMEInfo* info);
59 55
60 // Returns a list of availble IMEs. 56 // Returns a list of availble IMEs.
61 virtual void GetAvailableIMEList(IMEInfoList* list); 57 virtual void GetAvailableIMEList(IMEInfoList* list);
62 58
63 // Returns a list of properties for the currently selected IME. 59 // Returns a list of properties for the currently selected IME.
(...skipping 28 matching lines...) Expand all
92 // Creates a system tray item for display rotation lock. 88 // Creates a system tray item for display rotation lock.
93 // TODO(jamescook): Remove this when mus has support for display management 89 // TODO(jamescook): Remove this when mus has support for display management
94 // and we have a DisplayManager equivalent. See http://crbug.com/548429 90 // and we have a DisplayManager equivalent. See http://crbug.com/548429
95 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 91 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
96 SystemTray* tray); 92 SystemTray* tray);
97 }; 93 };
98 94
99 } // namespace ash 95 } // namespace ash
100 96
101 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 97 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698