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

Side by Side Diff: ash/system/audio/tray_audio.cc

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/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('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 #include "ash/common/system/chromeos/audio/tray_audio.h" 5 #include "ash/system/audio/tray_audio.h"
6 6
7 #include "ash/common/system/chromeos/audio/audio_detailed_view.h"
8 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"
9 #include "ash/common/system/chromeos/audio/volume_view.h"
10 #include "ash/common/system/tray/system_tray.h"
11 #include "ash/common/system/tray/tray_constants.h"
12 #include "ash/common/wm_shell.h" 7 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h" 8 #include "ash/common/wm_window.h"
14 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/system/audio/audio_detailed_view.h"
11 #include "ash/system/audio/tray_audio_delegate_chromeos.h"
12 #include "ash/system/audio/volume_view.h"
13 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/tray_constants.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "ui/display/display.h" 16 #include "ui/display/display.h"
17 #include "ui/display/manager/managed_display_info.h" 17 #include "ui/display/manager/managed_display_info.h"
18 #include "ui/display/screen.h" 18 #include "ui/display/screen.h"
19 #include "ui/views/view.h" 19 #include "ui/views/view.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
23 using chromeos::CrasAudioHandler; 23 using chromeos::CrasAudioHandler;
24 using chromeos::DBusThreadManager; 24 using chromeos::DBusThreadManager;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 volume_view_->SetVolumeLevel( 200 volume_view_->SetVolumeLevel(
201 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f); 201 static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
202 volume_view_->Update(); 202 volume_view_->Update();
203 } 203 }
204 204
205 if (audio_detail_view_) 205 if (audio_detail_view_)
206 audio_detail_view_->Update(); 206 audio_detail_view_->Update();
207 } 207 }
208 208
209 } // namespace ash 209 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/audio/tray_audio.h ('k') | ash/system/audio/tray_audio_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698