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

Side by Side Diff: ash/common/system/chromeos/audio/audio_detailed_view.h

Issue 2113113002: mash: Move chromeos audio system tray files to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/ash.gyp ('k') | ash/common/system/chromeos/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_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
7
8 #include <map>
7 9
8 #include "ash/common/system/tray/tray_details_view.h" 10 #include "ash/common/system/tray/tray_details_view.h"
9 #include "ash/common/system/tray/view_click_listener.h" 11 #include "ash/common/system/tray/view_click_listener.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "chromeos/audio/audio_device.h" 13 #include "chromeos/audio/audio_device.h"
12 #include "ui/gfx/font.h" 14 #include "ui/gfx/font.h"
13 15
14 namespace views { 16 namespace views {
15 class View; 17 class View;
16 } 18 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 chromeos::AudioDeviceList output_devices_; 51 chromeos::AudioDeviceList output_devices_;
50 chromeos::AudioDeviceList input_devices_; 52 chromeos::AudioDeviceList input_devices_;
51 AudioDeviceMap device_map_; 53 AudioDeviceMap device_map_;
52 54
53 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView); 55 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView);
54 }; 56 };
55 57
56 } // namespace tray 58 } // namespace tray
57 } // namespace ash 59 } // namespace ash
58 60
59 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 61 #endif // ASH_COMMON_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/common/system/chromeos/audio/audio_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698