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

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

Issue 10825264: Consolidate volume control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 12 matching lines...) Expand all
23 23
24 private: 24 private:
25 // Overridden from TrayImageItem. 25 // Overridden from TrayImageItem.
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 virtual void UpdateAfterAshInit() OVERRIDE;
33 34
34 // Overridden from AudioObserver. 35 // Overridden from AudioObserver.
35 virtual void OnVolumeChanged(float percent) OVERRIDE; 36 virtual void OnVolumeChanged(float percent) OVERRIDE;
36 virtual void OnMuteToggled() OVERRIDE; 37 virtual void OnMuteToggled() OVERRIDE;
37 38
38 tray::VolumeView* volume_view_; 39 tray::VolumeView* volume_view_;
39 40
40 // Was |volume_view_| created for CreateDefaultView() rather than 41 // Was |volume_view_| created for CreateDefaultView() rather than
41 // CreateDetailedView()? Used to avoid resetting |volume_view_| 42 // CreateDetailedView()? Used to avoid resetting |volume_view_|
42 // inappropriately in DestroyDefaultView() or DestroyDetailedView(). 43 // inappropriately in DestroyDefaultView() or DestroyDetailedView().
43 bool is_default_view_; 44 bool is_default_view_;
44 45
45 DISALLOW_COPY_AND_ASSIGN(TrayVolume); 46 DISALLOW_COPY_AND_ASSIGN(TrayVolume);
46 }; 47 };
47 48
48 } // namespace internal 49 } // namespace internal
49 } // namespace ash 50 } // namespace ash
50 51
51 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_ 52 #endif // ASH_SYSTEM_AUDIO_TRAY_VOLUME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698