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

Side by Side Diff: ash/system/chromeos/settings/tray_settings.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 (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_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
6 #define ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_ 6 #define ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
7 7
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace tray { 11 namespace tray {
12 class SettingsDefaultView; 12 class SettingsDefaultView;
13 } 13 }
14 14
15 class TraySettings : public SystemTrayItem { 15 class TraySettings : public SystemTrayItem {
16 public: 16 public:
17 explicit TraySettings(SystemTray* system_tray); 17 explicit TraySettings(SystemTray* system_tray);
18 virtual ~TraySettings(); 18 virtual ~TraySettings();
19 19
20 private: 20 private:
21 // Overridden from SystemTrayItem 21 // Overridden from SystemTrayItem
22 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 22 virtual views::View* CreateTrayView(user::LoginStatus status) override;
23 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 23 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
24 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 24 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
25 virtual void DestroyTrayView() OVERRIDE; 25 virtual void DestroyTrayView() override;
26 virtual void DestroyDefaultView() OVERRIDE; 26 virtual void DestroyDefaultView() override;
27 virtual void DestroyDetailedView() OVERRIDE; 27 virtual void DestroyDetailedView() override;
28 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 28 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
29 29
30 tray::SettingsDefaultView* default_view_; 30 tray::SettingsDefaultView* default_view_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(TraySettings); 32 DISALLOW_COPY_AND_ASSIGN(TraySettings);
33 }; 33 };
34 34
35 } // namespace ash 35 } // namespace ash
36 36
37 #endif // ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_ 37 #endif // ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/tray_session_length_limit_unittest.cc ('k') | ash/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698