| OLD | NEW |
|---|
| 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_delegate_chromeos.h" | 5 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include "chromeos/audio/cras_audio_handler.h" | 7 #include "chromeos/audio/cras_audio_handler.h" |
| 8 #include "grit/ash_resources.h" | 8 #include "grit/ash_resources.h" |
| 9 | 9 |
| 10 using chromeos::CrasAudioHandler; | 10 using chromeos::CrasAudioHandler; |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 namespace system { | 13 namespace system { |
| 14 | 14 |
| 15 void TrayAudioDelegateChromeOs::AdjustOutputVolumeToAudibleLevel() { | 15 void TrayAudioDelegateChromeOs::AdjustOutputVolumeToAudibleLevel() { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 } | 66 } |
| 67 | 67 |
| 68 void TrayAudioDelegateChromeOs::SetActiveHDMIOutoutRediscoveringIfNecessary( | 68 void TrayAudioDelegateChromeOs::SetActiveHDMIOutoutRediscoveringIfNecessary( |
| 69 bool force_rediscovering) { | 69 bool force_rediscovering) { |
| 70 CrasAudioHandler::Get()->SetActiveHDMIOutoutRediscoveringIfNecessary( | 70 CrasAudioHandler::Get()->SetActiveHDMIOutoutRediscoveringIfNecessary( |
| 71 force_rediscovering); | 71 force_rediscovering); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace system | 74 } // namespace system |
| 75 } // namespace ash | 75 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2113113002:
mash: Move chromeos audio system tray files to //ash/common (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master