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

Side by Side Diff: ash/system/tray_update.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
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | ash/system/tray_update.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_UPDATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_UPDATE_H_
6 #define ASH_SYSTEM_TRAY_UPDATE_H_ 6 #define ASH_SYSTEM_TRAY_UPDATE_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 #include "ash/system/user/update_observer.h" 9 #include "ash/system/user/update_observer.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace views { 12 namespace views {
13 class View; 13 class View;
14 } 14 }
15 15
16 namespace ash { 16 namespace ash {
17 17
18 namespace tray { 18 namespace tray {
19 class UpdateNagger; 19 class UpdateNagger;
20 } 20 }
21 21
22 class TrayUpdate : public TrayImageItem, 22 class TrayUpdate : public TrayImageItem,
23 public UpdateObserver { 23 public UpdateObserver {
24 public: 24 public:
25 explicit TrayUpdate(SystemTray* system_tray); 25 explicit TrayUpdate(SystemTray* system_tray);
26 virtual ~TrayUpdate(); 26 virtual ~TrayUpdate();
27 27
28 private: 28 private:
29 // Overridden from TrayImageItem. 29 // Overridden from TrayImageItem.
30 virtual bool GetInitialVisibility() OVERRIDE; 30 virtual bool GetInitialVisibility() override;
31 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
32 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
33 virtual void DestroyDetailedView() OVERRIDE; 33 virtual void DestroyDetailedView() override;
34 34
35 // Overridden from UpdateObserver. 35 // Overridden from UpdateObserver.
36 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; 36 virtual void OnUpdateRecommended(UpdateSeverity severity) override;
37 37
38 // Used to nag the user in case the tray has been hidden too long with an 38 // Used to nag the user in case the tray has been hidden too long with an
39 // unseen update notification. 39 // unseen update notification.
40 scoped_ptr<tray::UpdateNagger> nagger_; 40 scoped_ptr<tray::UpdateNagger> nagger_;
41 41
42 UpdateObserver::UpdateSeverity severity_; 42 UpdateObserver::UpdateSeverity severity_;
43 43
44 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); 44 DISALLOW_COPY_AND_ASSIGN(TrayUpdate);
45 }; 45 };
46 46
47 } // namespace ash 47 } // namespace ash
48 48
49 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ 49 #endif // ASH_SYSTEM_TRAY_UPDATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | ash/system/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698