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

Side by Side Diff: ash/system/chromeos/audio/audio_detailed_view.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/audio_detailed_view.h" 5 #include "ash/system/chromeos/audio/audio_detailed_view.h"
6 6
7 #include "ash/system/tray/fixed_sized_scroll_view.h" 7 #include "ash/system/tray/fixed_sized_scroll_view.h"
8 #include "ash/system/tray/hover_highlight_view.h" 8 #include "ash/system/tray/hover_highlight_view.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 default: 42 default:
43 return base::UTF8ToUTF16(device.display_name); 43 return base::UTF8ToUTF16(device.display_name);
44 } 44 }
45 } 45 }
46 46
47 } // namespace 47 } // namespace
48 48
49 using chromeos::CrasAudioHandler; 49 using chromeos::CrasAudioHandler;
50 50
51 namespace ash { 51 namespace ash {
52 namespace internal {
53 namespace tray { 52 namespace tray {
54 53
55 AudioDetailedView::AudioDetailedView(SystemTrayItem* owner, 54 AudioDetailedView::AudioDetailedView(SystemTrayItem* owner,
56 user::LoginStatus login) 55 user::LoginStatus login)
57 : TrayDetailsView(owner), 56 : TrayDetailsView(owner),
58 login_(login) { 57 login_(login) {
59 CreateItems(); 58 CreateItems();
60 Update(); 59 Update();
61 } 60 }
62 61
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } else { 165 } else {
167 AudioDeviceMap::iterator iter = device_map_.find(sender); 166 AudioDeviceMap::iterator iter = device_map_.find(sender);
168 if (iter == device_map_.end()) 167 if (iter == device_map_.end())
169 return; 168 return;
170 chromeos::AudioDevice& device = iter->second; 169 chromeos::AudioDevice& device = iter->second;
171 CrasAudioHandler::Get()->SwitchToDevice(device); 170 CrasAudioHandler::Get()->SwitchToDevice(device);
172 } 171 }
173 } 172 }
174 173
175 } // namespace tray 174 } // namespace tray
176 } // namespace internal
177 } // namespace ash 175 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/audio/audio_detailed_view.h ('k') | ash/system/chromeos/audio/tray_audio_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698