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

Unified Diff: ash/system/audio/tray_volume.h

Issue 9585004: ash uber tray: Update the volume icon for various levels of volumes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698