| Index: ash/system/audio/tray_volume.h
|
| diff --git a/ash/system/audio/tray_volume.h b/ash/system/audio/tray_volume.h
|
| index a5f09b6e30d647c5baad660df18c7934f2635d16..45b91ecb1c73eac840c25dbfdfa5ccec51239ebf 100644
|
| --- a/ash/system/audio/tray_volume.h
|
| +++ b/ash/system/audio/tray_volume.h
|
| @@ -10,17 +10,13 @@
|
| #include "ash/system/tray/system_tray_item.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| -namespace views {
|
| -class ImageView;
|
| -}
|
| +namespace ash {
|
| +namespace internal {
|
|
|
| namespace tray {
|
| class VolumeView;
|
| }
|
|
|
| -namespace ash {
|
| -namespace internal {
|
| -
|
| class TrayVolume : public SystemTrayItem,
|
| public AudioController {
|
| public:
|
| @@ -28,7 +24,7 @@ class TrayVolume : public SystemTrayItem,
|
| virtual ~TrayVolume();
|
|
|
| private:
|
| - // Overridden from SystemTrayItem
|
| + // Overridden from SystemTrayItem.
|
| virtual views::View* CreateTrayView() OVERRIDE;
|
| virtual views::View* CreateDefaultView() OVERRIDE;
|
| virtual views::View* CreateDetailedView() OVERRIDE;
|
| @@ -40,7 +36,6 @@ class TrayVolume : public SystemTrayItem,
|
| virtual void OnVolumeChanged(float percent) OVERRIDE;
|
|
|
| scoped_ptr<tray::VolumeView> volume_view_;
|
| - scoped_ptr<views::ImageView> tray_view_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayVolume);
|
| };
|
|
|