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

Side by Side Diff: ash/system/date/tray_date.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/date/date_view.h ('k') | ash/system/ime/tray_ime.h » ('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_DATE_TRAY_DATE_H_ 5 #ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_
6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ 6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/date/clock_observer.h" 9 #include "ash/system/date/clock_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 // Returns view for help button if it is exists. Returns NULL otherwise. 43 // Returns view for help button if it is exists. Returns NULL otherwise.
44 views::View* GetHelpButtonView() const; 44 views::View* GetHelpButtonView() const;
45 45
46 const tray::TimeView* GetTimeTrayForTesting() const; 46 const tray::TimeView* GetTimeTrayForTesting() const;
47 const DateDefaultView* GetDefaultViewForTesting() const; 47 const DateDefaultView* GetDefaultViewForTesting() const;
48 views::View* CreateDefaultViewForTesting(user::LoginStatus status); 48 views::View* CreateDefaultViewForTesting(user::LoginStatus status);
49 49
50 private: 50 private:
51 // Overridden from SystemTrayItem. 51 // Overridden from SystemTrayItem.
52 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 52 virtual views::View* CreateTrayView(user::LoginStatus status) override;
53 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 53 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
54 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 54 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
55 virtual void DestroyTrayView() OVERRIDE; 55 virtual void DestroyTrayView() override;
56 virtual void DestroyDefaultView() OVERRIDE; 56 virtual void DestroyDefaultView() override;
57 virtual void DestroyDetailedView() OVERRIDE; 57 virtual void DestroyDetailedView() override;
58 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 58 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
59 virtual void UpdateAfterShelfAlignmentChange( 59 virtual void UpdateAfterShelfAlignmentChange(
60 ShelfAlignment alignment) OVERRIDE; 60 ShelfAlignment alignment) override;
61 61
62 // Overridden from ClockObserver. 62 // Overridden from ClockObserver.
63 virtual void OnDateFormatChanged() OVERRIDE; 63 virtual void OnDateFormatChanged() override;
64 virtual void OnSystemClockTimeUpdated() OVERRIDE; 64 virtual void OnSystemClockTimeUpdated() override;
65 virtual void OnSystemClockCanSetTimeChanged(bool can_set_time) OVERRIDE; 65 virtual void OnSystemClockCanSetTimeChanged(bool can_set_time) override;
66 virtual void Refresh() OVERRIDE; 66 virtual void Refresh() override;
67 67
68 void SetupLabelForTimeTray(views::Label* label); 68 void SetupLabelForTimeTray(views::Label* label);
69 69
70 tray::TimeView* time_tray_; 70 tray::TimeView* time_tray_;
71 DateDefaultView* default_view_; 71 DateDefaultView* default_view_;
72 user::LoginStatus login_status_; 72 user::LoginStatus login_status_;
73 73
74 #if defined(OS_CHROMEOS) 74 #if defined(OS_CHROMEOS)
75 scoped_ptr<SystemClockObserver> system_clock_observer_; 75 scoped_ptr<SystemClockObserver> system_clock_observer_;
76 #endif 76 #endif
77 77
78 DISALLOW_COPY_AND_ASSIGN(TrayDate); 78 DISALLOW_COPY_AND_ASSIGN(TrayDate);
79 }; 79 };
80 80
81 } // namespace ash 81 } // namespace ash
82 82
83 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ 83 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_
OLDNEW
« no previous file with comments | « ash/system/date/date_view.h ('k') | ash/system/ime/tray_ime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698