OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1228 ui::ime::InputMethodMenuManager* manager) { | 1228 ui::ime::InputMethodMenuManager* manager) { |
1229 GetSystemTrayNotifier()->NotifyRefreshIME(); | 1229 GetSystemTrayNotifier()->NotifyRefreshIME(); |
1230 } | 1230 } |
1231 | 1231 |
1232 // Overridden from CrasAudioHandler::AudioObserver. | 1232 // Overridden from CrasAudioHandler::AudioObserver. |
1233 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id, | 1233 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id, |
1234 int volume) { | 1234 int volume) { |
1235 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume); | 1235 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume); |
1236 } | 1236 } |
1237 | 1237 |
1238 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on) { | 1238 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on, |
1239 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on); | 1239 bool system_adjust) { |
| 1240 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on, system_adjust); |
1240 } | 1241 } |
1241 | 1242 |
1242 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */, | 1243 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */, |
1243 int /* gain */) { | 1244 int /* gain */) { |
1244 } | 1245 } |
1245 | 1246 |
1246 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) { | 1247 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) { |
1247 } | 1248 } |
1248 | 1249 |
1249 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() { | 1250 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1403 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1404 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
1404 << "ENABLE_SUPERVISED_USERS undefined."; | 1405 << "ENABLE_SUPERVISED_USERS undefined."; |
1405 return base::string16(); | 1406 return base::string16(); |
1406 } | 1407 } |
1407 | 1408 |
1408 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1409 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1409 return new SystemTrayDelegateChromeOS(); | 1410 return new SystemTrayDelegateChromeOS(); |
1410 } | 1411 } |
1411 | 1412 |
1412 } // namespace chromeos | 1413 } // namespace chromeos |
OLD | NEW |