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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/switchable_windows.cc ('k') | ash/system/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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_AUDIO_H_ 5 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_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 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 namespace system { 14 namespace system {
15 class TrayAudioDelegate; 15 class TrayAudioDelegate;
16 } 16 }
17 17
18 namespace internal {
19
20 namespace tray { 18 namespace tray {
21 class VolumeView; 19 class VolumeView;
22 } 20 }
23 21
24 class TrayAudio : public TrayImageItem, 22 class TrayAudio : public TrayImageItem,
25 public AudioObserver { 23 public AudioObserver {
26 public: 24 public:
27 TrayAudio(SystemTray* system_tray, 25 TrayAudio(SystemTray* system_tray,
28 scoped_ptr<system::TrayAudioDelegate> audio_delegate); 26 scoped_ptr<system::TrayAudioDelegate> audio_delegate);
29 virtual ~TrayAudio(); 27 virtual ~TrayAudio();
(...skipping 25 matching lines...) Expand all
55 // Overridden from AudioObserver. 53 // Overridden from AudioObserver.
56 virtual void OnOutputVolumeChanged() OVERRIDE; 54 virtual void OnOutputVolumeChanged() OVERRIDE;
57 virtual void OnOutputMuteChanged() OVERRIDE; 55 virtual void OnOutputMuteChanged() OVERRIDE;
58 virtual void OnAudioNodesChanged() OVERRIDE; 56 virtual void OnAudioNodesChanged() OVERRIDE;
59 virtual void OnActiveOutputNodeChanged() OVERRIDE; 57 virtual void OnActiveOutputNodeChanged() OVERRIDE;
60 virtual void OnActiveInputNodeChanged() OVERRIDE; 58 virtual void OnActiveInputNodeChanged() OVERRIDE;
61 59
62 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 60 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
63 }; 61 };
64 62
65 } // namespace internal
66 } // namespace ash 63 } // namespace ash
67 64
68 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ 65 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « ash/switchable_windows.cc ('k') | ash/system/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698