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

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

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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
« no previous file with comments | « ash/common/system/audio/audio_observer.h ('k') | ash/common/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_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_H_
6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "ash/common/system/audio/audio_observer.h"
12 #include "ash/common/system/tray/tray_image_item.h" 13 #include "ash/common/system/tray/tray_image_item.h"
13 #include "ash/system/audio/audio_observer.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "ui/display/display_observer.h" 15 #include "ui/display/display_observer.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 namespace system { 19 namespace system {
20 class TrayAudioDelegate; 20 class TrayAudioDelegate;
21 } 21 }
22 22
23 namespace tray { 23 namespace tray {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 void OnActiveOutputNodeChanged() override; 69 void OnActiveOutputNodeChanged() override;
70 void OnActiveInputNodeChanged() override; 70 void OnActiveInputNodeChanged() override;
71 71
72 void ChangeInternalSpeakerChannelMode(); 72 void ChangeInternalSpeakerChannelMode();
73 73
74 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 74 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
75 }; 75 };
76 76
77 } // namespace ash 77 } // namespace ash
78 78
79 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_ 79 #endif // ASH_COMMON_SYSTEM_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « ash/common/system/audio/audio_observer.h ('k') | ash/common/system/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698