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

Side by Side Diff: ash/system/chromeos/audio/tray_audio.h

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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/shell_unittest.cc ('k') | ash/system/chromeos/audio/tray_audio.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_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 #include "chromeos/audio/cras_audio_handler.h" 9 #include "chromeos/audio/cras_audio_handler.h"
10 10
(...skipping 14 matching lines...) Expand all
25 private: 25 private:
26 // Overridden from TrayImageItem. 26 // Overridden from TrayImageItem.
27 virtual bool GetInitialVisibility() OVERRIDE; 27 virtual bool GetInitialVisibility() OVERRIDE;
28 28
29 // Overridden from SystemTrayItem. 29 // Overridden from SystemTrayItem.
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
32 virtual void DestroyDefaultView() OVERRIDE; 32 virtual void DestroyDefaultView() OVERRIDE;
33 virtual void DestroyDetailedView() OVERRIDE; 33 virtual void DestroyDetailedView() OVERRIDE;
34 virtual bool ShouldHideArrow() const OVERRIDE; 34 virtual bool ShouldHideArrow() const OVERRIDE;
35 virtual bool ShouldShowLauncher() const OVERRIDE; 35 virtual bool ShouldShowShelf() const OVERRIDE;
36 36
37 // Overridden from chromeos::CrasAudioHandler::AudioObserver. 37 // Overridden from chromeos::CrasAudioHandler::AudioObserver.
38 virtual void OnOutputVolumeChanged() OVERRIDE; 38 virtual void OnOutputVolumeChanged() OVERRIDE;
39 virtual void OnOutputMuteChanged() OVERRIDE; 39 virtual void OnOutputMuteChanged() OVERRIDE;
40 virtual void OnInputGainChanged() OVERRIDE; 40 virtual void OnInputGainChanged() OVERRIDE;
41 virtual void OnInputMuteChanged() OVERRIDE; 41 virtual void OnInputMuteChanged() OVERRIDE;
42 virtual void OnAudioNodesChanged() OVERRIDE; 42 virtual void OnAudioNodesChanged() OVERRIDE;
43 virtual void OnActiveOutputNodeChanged() OVERRIDE; 43 virtual void OnActiveOutputNodeChanged() OVERRIDE;
44 virtual void OnActiveInputNodeChanged() OVERRIDE; 44 virtual void OnActiveInputNodeChanged() OVERRIDE;
45 45
46 void Update(); 46 void Update();
47 47
48 tray::VolumeView* volume_view_; 48 tray::VolumeView* volume_view_;
49 tray::AudioDetailedView* audio_detail_; 49 tray::AudioDetailedView* audio_detail_;
50 50
51 // True if VolumeView should be created for accelerator pop up; 51 // True if VolumeView should be created for accelerator pop up;
52 // Otherwise, it should be created for detailed view in ash tray bubble. 52 // Otherwise, it should be created for detailed view in ash tray bubble.
53 bool pop_up_volume_view_; 53 bool pop_up_volume_view_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 55 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
56 }; 56 };
57 57
58 } // namespace internal 58 } // namespace internal
59 } // namespace ash 59 } // namespace ash
60 60
61 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 61 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/chromeos/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698