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

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

Issue 627593003: Adding infrastructure for possibility of changing manager names for the supervised accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "ash/system/tray/view_click_listener.h" 10 #include "ash/system/tray/view_click_listener.h"
11 #include "base/memory/weak_ptr.h"
11 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
12 13
13 namespace ash { 14 namespace ash {
14 class LabelTrayView; 15 class LabelTrayView;
15 class SystemTray; 16 class SystemTray;
16 17
17 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem, 18 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem,
18 public ViewClickListener { 19 public ViewClickListener {
19 public: 20 public:
20 explicit TraySupervisedUser(SystemTray* system_tray); 21 explicit TraySupervisedUser(SystemTray* system_tray);
(...skipping 11 matching lines...) Expand all
32 // Overridden from ViewClickListener. 33 // Overridden from ViewClickListener.
33 virtual void OnViewClicked(views::View* sender) OVERRIDE; 34 virtual void OnViewClicked(views::View* sender) OVERRIDE;
34 35
35 private: 36 private:
36 friend class TraySupervisedUserTest; 37 friend class TraySupervisedUserTest;
37 38
38 static const char kNotificationId[]; 39 static const char kNotificationId[];
39 40
40 void CreateOrUpdateNotification(const base::string16& new_message); 41 void CreateOrUpdateNotification(const base::string16& new_message);
41 42
43 void CreateOrUpdateSupervisedWarningNotification();
44
45 void OnCustodianInfoChanged();
46
42 LabelTrayView* tray_view_; 47 LabelTrayView* tray_view_;
48
43 // Previous login status to avoid showing notification upon unlock. 49 // Previous login status to avoid showing notification upon unlock.
44 user::LoginStatus status_; 50 user::LoginStatus status_;
45 51
46 // Previous user supervised state to avoid showing notification upon unlock. 52 // Previous user supervised state to avoid showing notification upon unlock.
47 bool is_user_supervised_; 53 bool is_user_supervised_;
48 54
55 base::WeakPtrFactory<TraySupervisedUser> weak_factory_;
56
49 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser); 57 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser);
50 }; 58 };
51 59
52 } // namespace ash 60 } // namespace ash
53 61
54 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H 62 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
OLDNEW
« no previous file with comments | « no previous file | ash/system/chromeos/supervised/tray_supervised_user.cc » ('j') | ash/system/tray/default_system_tray_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698