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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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/system/audio/audio_detailed_view.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_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 5 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 6 #define ASH_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/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/system/tray/tray_image_item.h" 13 #include "ash/system/tray/tray_image_item.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "chromeos/audio/cras_audio_handler.h" 15 #include "chromeos/audio/cras_audio_handler.h"
16 #include "chromeos/dbus/power_manager_client.h" 16 #include "chromeos/dbus/power_manager_client.h"
17 #include "ui/display/display_observer.h" 17 #include "ui/display/display_observer.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
21 namespace system { 21 namespace system {
22 class TrayAudioDelegate; 22 class TrayAudioDelegate;
23 } 23 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Otherwise, it should be created for detailed view in ash tray bubble. 84 // Otherwise, it should be created for detailed view in ash tray bubble.
85 bool pop_up_volume_view_; 85 bool pop_up_volume_view_;
86 86
87 tray::AudioDetailedView* audio_detail_view_; 87 tray::AudioDetailedView* audio_detail_view_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(TrayAudio); 89 DISALLOW_COPY_AND_ASSIGN(TrayAudio);
90 }; 90 };
91 91
92 } // namespace ash 92 } // namespace ash
93 93
94 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_TRAY_AUDIO_H_ 94 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_
OLDNEW
« no previous file with comments | « ash/system/audio/audio_detailed_view.cc ('k') | ash/system/audio/tray_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698