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

Side by Side Diff: ash/system/chromeos/audio/audio_detailed_view.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
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_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
6 #define ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 6 #define ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
7 7
8 #include "ash/system/tray/tray_details_view.h" 8 #include "ash/system/tray/tray_details_view.h"
9 #include "ash/system/tray/view_click_listener.h" 9 #include "ash/system/tray/view_click_listener.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
11 #include "chromeos/audio/audio_device.h" 11 #include "chromeos/audio/audio_device.h"
12 12
13 #include "ui/gfx/font.h" 13 #include "ui/gfx/font.h"
14 14
15 namespace views { 15 namespace views {
16 class View; 16 class View;
17 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 namespace internal {
21
22 class HoverHighlightView; 20 class HoverHighlightView;
23 21
24 namespace tray { 22 namespace tray {
25 23
26 class AudioDetailedView : public TrayDetailsView, 24 class AudioDetailedView : public TrayDetailsView,
27 public ViewClickListener { 25 public ViewClickListener {
28 public: 26 public:
29 AudioDetailedView(SystemTrayItem* owner, user::LoginStatus login); 27 AudioDetailedView(SystemTrayItem* owner, user::LoginStatus login);
30 28
31 virtual ~AudioDetailedView(); 29 virtual ~AudioDetailedView();
(...skipping 21 matching lines...) Expand all
53 typedef std::map<views::View*, chromeos::AudioDevice> AudioDeviceMap; 51 typedef std::map<views::View*, chromeos::AudioDevice> AudioDeviceMap;
54 52
55 chromeos::AudioDeviceList output_devices_; 53 chromeos::AudioDeviceList output_devices_;
56 chromeos::AudioDeviceList input_devices_; 54 chromeos::AudioDeviceList input_devices_;
57 AudioDeviceMap device_map_; 55 AudioDeviceMap device_map_;
58 56
59 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView); 57 DISALLOW_COPY_AND_ASSIGN(AudioDetailedView);
60 }; 58 };
61 59
62 } // namespace tray 60 } // namespace tray
63 } // namespace internal
64 } // namespace ash 61 } // namespace ash
65 62
66 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_ 63 #endif // ASH_SYSTEM_CHROMEOS_AUDIO_AUDIO_DETAILED_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/chromeos/audio/audio_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698