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

Side by Side Diff: ash/system/chromeos/tray_tracing.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/chromeos/tray_display_unittest.cc ('k') | ash/system/chromeos/tray_tracing.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TRACING_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRACING_H_
6 #define ASH_SYSTEM_TRAY_TRACING_H_ 6 #define ASH_SYSTEM_TRAY_TRACING_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 10
(...skipping 17 matching lines...) Expand all
28 class TrayTracing : public TrayImageItem, 28 class TrayTracing : public TrayImageItem,
29 public TracingObserver { 29 public TracingObserver {
30 public: 30 public:
31 explicit TrayTracing(SystemTray* system_tray); 31 explicit TrayTracing(SystemTray* system_tray);
32 virtual ~TrayTracing(); 32 virtual ~TrayTracing();
33 33
34 private: 34 private:
35 void SetTrayIconVisible(bool visible); 35 void SetTrayIconVisible(bool visible);
36 36
37 // Overridden from TrayImageItem. 37 // Overridden from TrayImageItem.
38 virtual bool GetInitialVisibility() OVERRIDE; 38 virtual bool GetInitialVisibility() override;
39 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
40 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
41 virtual void DestroyDefaultView() OVERRIDE; 41 virtual void DestroyDefaultView() override;
42 virtual void DestroyDetailedView() OVERRIDE; 42 virtual void DestroyDetailedView() override;
43 43
44 // Overridden from TracingObserver. 44 // Overridden from TracingObserver.
45 virtual void OnTracingModeChanged(bool value) OVERRIDE; 45 virtual void OnTracingModeChanged(bool value) override;
46 46
47 views::View* default_; 47 views::View* default_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(TrayTracing); 49 DISALLOW_COPY_AND_ASSIGN(TrayTracing);
50 }; 50 };
51 51
52 } // namespace ash 52 } // namespace ash
53 53
54 #endif // ASH_SYSTEM_TRAY_TRACING_H_ 54 #endif // ASH_SYSTEM_TRAY_TRACING_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_display_unittest.cc ('k') | ash/system/chromeos/tray_tracing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698