| OLD | NEW |
| 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_AUDIO_TRAY_AUDIO_H_ | 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ |
| 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ | 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ |
| 7 | 7 |
| 8 #include "ash/system/chromeos/audio/audio_observer.h" | 8 #include "ash/system/chromeos/audio/audio_observer.h" |
| 9 #include "ash/system/tray/tray_image_item.h" | 9 #include "ash/system/tray/tray_image_item.h" |
| 10 #include "chromeos/audio/cras_audio_handler.h" | 10 #include "chromeos/audio/cras_audio_handler.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 virtual bool ShouldHideArrow() const OVERRIDE; | 36 virtual bool ShouldHideArrow() const OVERRIDE; |
| 37 virtual bool ShouldShowLauncher() const OVERRIDE; | 37 virtual bool ShouldShowLauncher() const OVERRIDE; |
| 38 | 38 |
| 39 // Overridden from AudioObserver. | 39 // Overridden from AudioObserver. |
| 40 virtual void OnVolumeChanged(float percent) OVERRIDE; | 40 virtual void OnVolumeChanged(float percent) OVERRIDE; |
| 41 virtual void OnMuteToggled() OVERRIDE; | 41 virtual void OnMuteToggled() OVERRIDE; |
| 42 | 42 |
| 43 // Overridden from chromeos::CrasAudioHandler::AudioObserver. | 43 // Overridden from chromeos::CrasAudioHandler::AudioObserver. |
| 44 virtual void OnOutputVolumeChanged() OVERRIDE; | 44 virtual void OnOutputVolumeChanged() OVERRIDE; |
| 45 virtual void OnOutputMuteChanged() OVERRIDE; | 45 virtual void OnOutputMuteChanged() OVERRIDE; |
| 46 virtual void OnInputGainChanged() OVERRIDE; | |
| 47 virtual void OnInputMuteChanged() OVERRIDE; | |
| 48 virtual void OnAudioNodesChanged() OVERRIDE; | 46 virtual void OnAudioNodesChanged() OVERRIDE; |
| 49 virtual void OnActiveOutputNodeChanged() OVERRIDE; | 47 virtual void OnActiveOutputNodeChanged() OVERRIDE; |
| 50 virtual void OnActiveInputNodeChanged() OVERRIDE; | 48 virtual void OnActiveInputNodeChanged() OVERRIDE; |
| 51 | 49 |
| 52 void Update(); | 50 void Update(); |
| 53 | 51 |
| 54 tray::VolumeView* volume_view_; | 52 tray::VolumeView* volume_view_; |
| 55 tray::AudioDetailedView* audio_detail_; | 53 tray::AudioDetailedView* audio_detail_; |
| 56 | 54 |
| 57 // True if VolumeView should be created for accelerator pop up; | 55 // True if VolumeView should be created for accelerator pop up; |
| 58 // Otherwise, it should be created for detailed view in ash tray bubble. | 56 // Otherwise, it should be created for detailed view in ash tray bubble. |
| 59 bool pop_up_volume_view_; | 57 bool pop_up_volume_view_; |
| 60 | 58 |
| 61 DISALLOW_COPY_AND_ASSIGN(TrayAudio); | 59 DISALLOW_COPY_AND_ASSIGN(TrayAudio); |
| 62 }; | 60 }; |
| 63 | 61 |
| 64 } // namespace internal | 62 } // namespace internal |
| 65 } // namespace ash | 63 } // namespace ash |
| 66 | 64 |
| 67 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ | 65 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ |
| OLD | NEW |