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

Side by Side Diff: ash/system/audio/tray_volume.h

Issue 10830027: Implement new slider control and disable the volume control when audio is muted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move enum from .h to .cc. Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/audio/audio_observer.h ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 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 10
(...skipping 15 matching lines...) Expand all
26 virtual bool GetInitialVisibility() OVERRIDE; 26 virtual bool GetInitialVisibility() OVERRIDE;
27 27
28 // Overridden from SystemTrayItem. 28 // Overridden from SystemTrayItem.
29 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
30 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
31 virtual void DestroyDefaultView() OVERRIDE; 31 virtual void DestroyDefaultView() OVERRIDE;
32 virtual void DestroyDetailedView() OVERRIDE; 32 virtual void DestroyDetailedView() OVERRIDE;
33 33
34 // Overridden from AudioObserver. 34 // Overridden from AudioObserver.
35 virtual void OnVolumeChanged(float percent) OVERRIDE; 35 virtual void OnVolumeChanged(float percent) OVERRIDE;
36 virtual void OnMuteToggled() OVERRIDE;
36 37
37 tray::VolumeView* volume_view_; 38 tray::VolumeView* volume_view_;
38 39
39 // Was |volume_view_| created for CreateDefaultView() rather than 40 // Was |volume_view_| created for CreateDefaultView() rather than
40 // CreateDetailedView()? Used to avoid resetting |volume_view_| 41 // CreateDetailedView()? Used to avoid resetting |volume_view_|
41 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). 42 // inappropriately in DestroyDefaultView() or DestroyDetailedView().
42 bool is_default_view_; 43 bool is_default_view_;
43 44
44 DISALLOW_COPY_AND_ASSIGN(TrayVolume); 45 DISALLOW_COPY_AND_ASSIGN(TrayVolume);
45 }; 46 };
46 47
47 } // namespace internal 48 } // namespace internal
48 } // namespace ash 49 } // namespace ash
49 50
50 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ 51 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_
OLDNEW
« no previous file with comments | « ash/system/audio/audio_observer.h ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698