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

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

Issue 871373011: Child accounts icons added to Chrome OS notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H 5 #ifndef ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
6 #define ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H 6 #define ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h" 9 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
(...skipping 28 matching lines...) Expand all
39 39
40 private: 40 private:
41 friend class TraySupervisedUserTest; 41 friend class TraySupervisedUserTest;
42 42
43 static const char kNotificationId[]; 43 static const char kNotificationId[];
44 44
45 void CreateOrUpdateNotification(const base::string16& new_message); 45 void CreateOrUpdateNotification(const base::string16& new_message);
46 46
47 void CreateOrUpdateSupervisedWarningNotification(); 47 void CreateOrUpdateSupervisedWarningNotification();
48 48
49 int GetSupervisedUserIconId();
50
49 LabelTrayView* tray_view_; 51 LabelTrayView* tray_view_;
50 52
51 // Previous login status to avoid showing notification upon unlock. 53 // Previous login status to avoid showing notification upon unlock.
52 user::LoginStatus status_; 54 user::LoginStatus status_;
53 55
54 // Previous user supervised state to avoid showing notification upon unlock. 56 // Previous user supervised state to avoid showing notification upon unlock.
55 bool is_user_supervised_; 57 bool is_user_supervised_;
56 58
57 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser); 59 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser);
58 }; 60 };
59 61
60 } // namespace ash 62 } // namespace ash
61 63
62 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H 64 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698