| 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_AUDIO_TRAY_VOLUME_H_ | 5 #ifndef ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ |
| 6 #define ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ | 6 #define ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ash/system/audio/audio_observer.h" | 9 #include "ash/system/audio/audio_observer.h" |
| 10 #include "ash/system/tray/tray_image_item.h" | 10 #include "ash/system/tray/tray_image_item.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 | 11 |
| 13 namespace ash { | 12 namespace ash { |
| 14 namespace internal { | 13 namespace internal { |
| 15 | 14 |
| 16 namespace tray { | 15 namespace tray { |
| 17 class VolumeView; | 16 class VolumeView; |
| 18 } | 17 } |
| 19 | 18 |
| 20 class TrayVolume : public TrayImageItem, | 19 class TrayVolume : public TrayImageItem, |
| 21 public AudioObserver { | 20 public AudioObserver { |
| 22 public: | 21 public: |
| 23 TrayVolume(); | 22 TrayVolume(); |
| 24 virtual ~TrayVolume(); | 23 virtual ~TrayVolume(); |
| 25 | 24 |
| 26 private: | 25 private: |
| 27 // Overridden from TrayImageItem. | 26 // Overridden from TrayImageItem. |
| 28 virtual bool GetInitialVisibility() OVERRIDE; | 27 virtual bool GetInitialVisibility() OVERRIDE; |
| 29 | 28 |
| 30 // Overridden from SystemTrayItem. | 29 // Overridden from SystemTrayItem. |
| 31 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; |
| 32 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; |
| 33 virtual void DestroyDefaultView() OVERRIDE; | 32 virtual void DestroyDefaultView() OVERRIDE; |
| 34 virtual void DestroyDetailedView() OVERRIDE; | 33 virtual void DestroyDetailedView() OVERRIDE; |
| 35 | 34 |
| 36 // Overridden from AudioObserver. | 35 // Overridden from AudioObserver. |
| 37 virtual void OnVolumeChanged(float percent) OVERRIDE; | 36 virtual void OnVolumeChanged(float percent) OVERRIDE; |
| 38 | 37 |
| 39 scoped_ptr<tray::VolumeView> volume_view_; | 38 tray::VolumeView* volume_view_; |
| 40 | 39 |
| 41 // Was |volume_view_| created for CreateDefaultView() rather than | 40 // Was |volume_view_| created for CreateDefaultView() rather than |
| 42 // CreateDetailedView()? Used to avoid resetting |volume_view_| | 41 // CreateDetailedView()? Used to avoid resetting |volume_view_| |
| 43 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). | 42 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). |
| 44 bool is_default_view_; | 43 bool is_default_view_; |
| 45 | 44 |
| 46 DISALLOW_COPY_AND_ASSIGN(TrayVolume); | 45 DISALLOW_COPY_AND_ASSIGN(TrayVolume); |
| 47 }; | 46 }; |
| 48 | 47 |
| 49 } // namespace internal | 48 } // namespace internal |
| 50 } // namespace ash | 49 } // namespace ash |
| 51 | 50 |
| 52 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ | 51 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ |
| OLD | NEW |