OLD | NEW |
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_AUDIO_TRAY_AUDIO_H_ | 5 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ | 6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
7 | 7 |
8 #include "ash/system/audio/audio_observer.h" | 8 #include "ash/system/audio/audio_observer.h" |
9 #include "ash/system/tray/tray_image_item.h" | 9 #include "ash/system/tray/tray_image_item.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 | 35 |
36 scoped_ptr<system::TrayAudioDelegate> audio_delegate_; | 36 scoped_ptr<system::TrayAudioDelegate> audio_delegate_; |
37 tray::VolumeView* volume_view_; | 37 tray::VolumeView* volume_view_; |
38 | 38 |
39 // True if VolumeView should be created for accelerator pop up; | 39 // True if VolumeView should be created for accelerator pop up; |
40 // Otherwise, it should be created for detailed view in ash tray bubble. | 40 // Otherwise, it should be created for detailed view in ash tray bubble. |
41 bool pop_up_volume_view_; | 41 bool pop_up_volume_view_; |
42 | 42 |
43 private: | 43 private: |
44 // Overridden from TrayImageItem. | 44 // Overridden from TrayImageItem. |
45 virtual bool GetInitialVisibility() OVERRIDE; | 45 virtual bool GetInitialVisibility() override; |
46 | 46 |
47 // Overridden from SystemTrayItem. | 47 // Overridden from SystemTrayItem. |
48 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 48 virtual views::View* CreateDefaultView(user::LoginStatus status) override; |
49 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 49 virtual views::View* CreateDetailedView(user::LoginStatus status) override; |
50 virtual void DestroyDefaultView() OVERRIDE; | 50 virtual void DestroyDefaultView() override; |
51 virtual void DestroyDetailedView() OVERRIDE; | 51 virtual void DestroyDetailedView() override; |
52 virtual bool ShouldHideArrow() const OVERRIDE; | 52 virtual bool ShouldHideArrow() const override; |
53 virtual bool ShouldShowShelf() const OVERRIDE; | 53 virtual bool ShouldShowShelf() const override; |
54 | 54 |
55 // Overridden from AudioObserver. | 55 // Overridden from AudioObserver. |
56 virtual void OnOutputVolumeChanged() OVERRIDE; | 56 virtual void OnOutputVolumeChanged() override; |
57 virtual void OnOutputMuteChanged() OVERRIDE; | 57 virtual void OnOutputMuteChanged() override; |
58 virtual void OnAudioNodesChanged() OVERRIDE; | 58 virtual void OnAudioNodesChanged() override; |
59 virtual void OnActiveOutputNodeChanged() OVERRIDE; | 59 virtual void OnActiveOutputNodeChanged() override; |
60 virtual void OnActiveInputNodeChanged() OVERRIDE; | 60 virtual void OnActiveInputNodeChanged() override; |
61 | 61 |
62 // Overridden from gfx::DisplayObserver. | 62 // Overridden from gfx::DisplayObserver. |
63 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 63 virtual void OnDisplayAdded(const gfx::Display& new_display) override; |
64 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 64 virtual void OnDisplayRemoved(const gfx::Display& old_display) override; |
65 virtual void OnDisplayMetricsChanged(const gfx::Display& display, | 65 virtual void OnDisplayMetricsChanged(const gfx::Display& display, |
66 uint32_t changed_metrics) OVERRIDE; | 66 uint32_t changed_metrics) override; |
67 | 67 |
68 void ChangeInternalSpeakerChannelMode(); | 68 void ChangeInternalSpeakerChannelMode(); |
69 | 69 |
70 DISALLOW_COPY_AND_ASSIGN(TrayAudio); | 70 DISALLOW_COPY_AND_ASSIGN(TrayAudio); |
71 }; | 71 }; |
72 | 72 |
73 } // namespace ash | 73 } // namespace ash |
74 | 74 |
75 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ | 75 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ |
OLD | NEW |