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

Side by Side Diff: ash/system/audio/audio_detailed_view.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/accessibility_observer.h ('k') | ash/system/audio/audio_detailed_view.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_AUDIO_DETAILED_VIEW_H_ 5 #ifndef ASH_SYSTEM_AUDIO_AUDIO_DETAILED_VIEW_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 6 #define ASH_SYSTEM_AUDIO_AUDIO_DETAILED_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/common/system/tray/tray_details_view.h" 10 #include "ash/system/tray/tray_details_view.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "chromeos/audio/audio_device.h" 12 #include "chromeos/audio/audio_device.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 struct VectorIcon; 15 struct VectorIcon;
16 } 16 }
17 17
18 namespace views { 18 namespace views {
19 class View; 19 class View;
20 } 20 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 chromeos::AudioDeviceList output_devices_; 56 chromeos::AudioDeviceList output_devices_;
57 chromeos::AudioDeviceList input_devices_; 57 chromeos::AudioDeviceList input_devices_;
58 AudioDeviceMap device_map_; 58 AudioDeviceMap device_map_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView); 60 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView);
61 }; 61 };
62 62
63 } // namespace tray 63 } // namespace tray
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 66 #endif // ASH_SYSTEM_AUDIO_AUDIO_DETAILED_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/accessibility_observer.h ('k') | ash/system/audio/audio_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698