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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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/strings/string16.h" 11 #include "base/strings/string16.h"
12 12
13 namespace ash { 13 namespace ash {
14 class LabelTrayView; 14 class LabelTrayView;
15 class SystemTray; 15 class SystemTray;
16 16
17 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem, 17 class ASH_EXPORT TraySupervisedUser : public SystemTrayItem,
18 public ViewClickListener { 18 public ViewClickListener {
19 public: 19 public:
20 explicit TraySupervisedUser(SystemTray* system_tray); 20 explicit TraySupervisedUser(SystemTray* system_tray);
21 virtual ~TraySupervisedUser(); 21 virtual ~TraySupervisedUser();
22 22
23 // If message is not empty updates content of default view, otherwise hides 23 // If message is not empty updates content of default view, otherwise hides
24 // tray items. 24 // tray items.
25 void UpdateMessage(); 25 void UpdateMessage();
26 26
27 // Overridden from SystemTrayItem. 27 // Overridden from SystemTrayItem.
28 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
29 virtual void DestroyDefaultView() OVERRIDE; 29 virtual void DestroyDefaultView() override;
30 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 30 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
31 31
32 // Overridden from ViewClickListener. 32 // Overridden from ViewClickListener.
33 virtual void OnViewClicked(views::View* sender) OVERRIDE; 33 virtual void OnViewClicked(views::View* sender) override;
34 34
35 private: 35 private:
36 friend class TraySupervisedUserTest; 36 friend class TraySupervisedUserTest;
37 37
38 static const char kNotificationId[]; 38 static const char kNotificationId[];
39 39
40 void CreateOrUpdateNotification(const base::string16& new_message); 40 void CreateOrUpdateNotification(const base::string16& new_message);
41 41
42 LabelTrayView* tray_view_; 42 LabelTrayView* tray_view_;
43 // Previous login status to avoid showing notification upon unlock. 43 // Previous login status to avoid showing notification upon unlock.
44 user::LoginStatus status_; 44 user::LoginStatus status_;
45 45
46 // Previous user supervised state to avoid showing notification upon unlock. 46 // Previous user supervised state to avoid showing notification upon unlock.
47 bool is_user_supervised_; 47 bool is_user_supervised_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser); 49 DISALLOW_COPY_AND_ASSIGN(TraySupervisedUser);
50 }; 50 };
51 51
52 } // namespace ash 52 } // namespace ash
53 53
54 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H 54 #endif // ASH_SYSTEM_CHROMEOS_SUPERVISED_TRAY_SUPERVISED_USER_H
OLDNEW
« no previous file with comments | « ash/system/chromeos/settings/tray_settings.cc ('k') | ash/system/chromeos/supervised/tray_supervised_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698