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

Side by Side Diff: ash/system/chromeos/audio/tray_audio_chromeos.cc

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 #include "ash/system/chromeos/audio/tray_audio_chromeos.h" 5 #include "ash/system/chromeos/audio/tray_audio_chromeos.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/audio/volume_view.h" 9 #include "ash/system/audio/volume_view.h"
10 #include "ash/system/chromeos/audio/audio_detailed_view.h" 10 #include "ash/system/chromeos/audio/audio_detailed_view.h"
11 #include "ash/system/chromeos/audio/tray_audio_delegate_chromeos.h" 11 #include "ash/system/chromeos/audio/tray_audio_delegate_chromeos.h"
12 #include "ui/views/view.h" 12 #include "ui/views/view.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 using system::TrayAudioDelegate; 16 using system::TrayAudioDelegate;
17 using system::TrayAudioDelegateChromeOs; 17 using system::TrayAudioDelegateChromeOs;
18 18
19 namespace internal {
20
21 TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray) 19 TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray)
22 : TrayAudio(system_tray, 20 : TrayAudio(system_tray,
23 scoped_ptr<TrayAudioDelegate>(new TrayAudioDelegateChromeOs())), 21 scoped_ptr<TrayAudioDelegate>(new TrayAudioDelegateChromeOs())),
24 audio_detail_view_(NULL) { 22 audio_detail_view_(NULL) {
25 } 23 }
26 24
27 TrayAudioChromeOs::~TrayAudioChromeOs() { 25 TrayAudioChromeOs::~TrayAudioChromeOs() {
28 } 26 }
29 27
30 void TrayAudioChromeOs::Update() { 28 void TrayAudioChromeOs::Update() {
(...skipping 18 matching lines...) Expand all
49 47
50 void TrayAudioChromeOs::DestroyDetailedView() { 48 void TrayAudioChromeOs::DestroyDetailedView() {
51 if (audio_detail_view_) { 49 if (audio_detail_view_) {
52 audio_detail_view_ = NULL; 50 audio_detail_view_ = NULL;
53 } else if (volume_view_) { 51 } else if (volume_view_) {
54 volume_view_ = NULL; 52 volume_view_ = NULL;
55 pop_up_volume_view_ = false; 53 pop_up_volume_view_ = false;
56 } 54 }
57 } 55 }
58 56
59 } // namespace internal
60 } // namespace ash 57 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/audio/tray_audio_chromeos.h ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698