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

Side by Side Diff: ash/system/chromeos/audio/tray_audio_chromeos.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_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/audio/tray_audio.h" 9 #include "ash/system/audio/tray_audio.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace tray { 13 namespace tray {
14 class AudioDetailedView; 14 class AudioDetailedView;
15 } 15 }
16 16
17 class ASH_EXPORT TrayAudioChromeOs : public TrayAudio { 17 class ASH_EXPORT TrayAudioChromeOs : public TrayAudio {
18 public: 18 public:
19 explicit TrayAudioChromeOs(SystemTray* system_tray); 19 explicit TrayAudioChromeOs(SystemTray* system_tray);
20 virtual ~TrayAudioChromeOs(); 20 virtual ~TrayAudioChromeOs();
21 21
22 protected: 22 protected:
23 // Overridden from TrayAudio 23 // Overridden from TrayAudio
24 virtual void Update() OVERRIDE; 24 virtual void Update() override;
25 25
26 private: 26 private:
27 // Overridden from SystemTrayItem. 27 // Overridden from SystemTrayItem.
28 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
29 virtual void DestroyDetailedView() OVERRIDE; 29 virtual void DestroyDetailedView() override;
30 30
31 tray::AudioDetailedView* audio_detail_view_; 31 tray::AudioDetailedView* audio_detail_view_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs); 33 DISALLOW_COPY_AND_ASSIGN(TrayAudioChromeOs);
34 }; 34 };
35 35
36 } // namespace ash 36 } // namespace ash
37 37
38 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_ 38 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/audio/audio_detailed_view.h ('k') | ash/system/chromeos/audio/tray_audio_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698