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

Side by Side Diff: ash/common/system/chromeos/supervised/tray_supervised_user.h

Issue 2715463004: Remove non-MD code from LabelTrayView (Closed)
Patch Set: estade comments Created 3 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h" 9 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
10 #include "ash/common/system/tray/system_tray_item.h" 10 #include "ash/common/system/tray/system_tray_item.h"
11 #include "ash/common/system/tray/view_click_listener.h" 11 #include "ash/common/system/tray/view_click_listener.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 14
15 namespace gfx {
16 struct VectorIcon;
17 } // namespace gfx
18
15 namespace ash { 19 namespace ash {
16 class LabelTrayView; 20 class LabelTrayView;
17 class SystemTray; 21 class SystemTray;
18 22
19 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem, 23 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem,
20 public ViewClickListener, 24 public ViewClickListener,
21 public CustodianInfoTrayObserver { 25 public CustodianInfoTrayObserver {
22 public: 26 public:
23 explicit TraySupervisedUser(SystemTray* system_tray); 27 explicit TraySupervisedUser(SystemTray* system_tray);
24 ~TraySupervisedUser() override; 28 ~TraySupervisedUser() override;
(...skipping 15 matching lines...) Expand all
40 44
41 private: 45 private:
42 friend class TraySupervisedUserTest; 46 friend class TraySupervisedUserTest;
43 47
44 static const char kNotificationId[]; 48 static const char kNotificationId[];
45 49
46 void CreateOrUpdateNotification(const base::string16& new_message); 50 void CreateOrUpdateNotification(const base::string16& new_message);
47 51
48 void CreateOrUpdateSupervisedWarningNotification(); 52 void CreateOrUpdateSupervisedWarningNotification();
49 53
50 int GetSupervisedUserIconId() const; 54 const gfx::VectorIcon& GetSupervisedUserIcon() const;
51 55
52 LabelTrayView* tray_view_; 56 LabelTrayView* tray_view_;
53 57
54 // Previous login status to avoid showing notification upon unlock. 58 // Previous login status to avoid showing notification upon unlock.
55 LoginStatus status_; 59 LoginStatus status_;
56 60
57 // Previous user supervised state to avoid showing notification upon unlock. 61 // Previous user supervised state to avoid showing notification upon unlock.
58 bool is_user_supervised_; 62 bool is_user_supervised_;
59 63
60 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser); 64 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser);
61 }; 65 };
62 66
63 } // namespace ash 67 } // namespace ash
64 68
65 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_ 69 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698