| 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 GetSystemTrayNotifier()->NotifyRefreshIME(); | 1209 GetSystemTrayNotifier()->NotifyRefreshIME(); |
| 1210 } | 1210 } |
| 1211 | 1211 |
| 1212 // Overridden from InputMethodMenuManager::Observer. | 1212 // Overridden from InputMethodMenuManager::Observer. |
| 1213 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( | 1213 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( |
| 1214 ui::ime::InputMethodMenuManager* manager) { | 1214 ui::ime::InputMethodMenuManager* manager) { |
| 1215 GetSystemTrayNotifier()->NotifyRefreshIME(); | 1215 GetSystemTrayNotifier()->NotifyRefreshIME(); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 // Overridden from CrasAudioHandler::AudioObserver. | 1218 // Overridden from CrasAudioHandler::AudioObserver. |
| 1219 void SystemTrayDelegateChromeOS::OnOutputVolumeChanged() { | 1219 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64 node_id, |
| 1220 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(); | 1220 double volume) { |
| 1221 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume); |
| 1221 } | 1222 } |
| 1222 | 1223 |
| 1223 void SystemTrayDelegateChromeOS::OnOutputMuteChanged() { | 1224 void SystemTrayDelegateChromeOS::OnOutputMuteChanged() { |
| 1224 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(); | 1225 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(); |
| 1225 } | 1226 } |
| 1226 | 1227 |
| 1227 void SystemTrayDelegateChromeOS::OnInputGainChanged() { | 1228 void SystemTrayDelegateChromeOS::OnInputGainChanged() { |
| 1228 } | 1229 } |
| 1229 | 1230 |
| 1230 void SystemTrayDelegateChromeOS::OnInputMuteChanged() { | 1231 void SystemTrayDelegateChromeOS::OnInputMuteChanged() { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1387 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1388 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1388 << "ENABLE_SUPERVISED_USERS undefined."; | 1389 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1389 return base::string16(); | 1390 return base::string16(); |
| 1390 } | 1391 } |
| 1391 | 1392 |
| 1392 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1393 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1393 return new SystemTrayDelegateChromeOS(); | 1394 return new SystemTrayDelegateChromeOS(); |
| 1394 } | 1395 } |
| 1395 | 1396 |
| 1396 } // namespace chromeos | 1397 } // namespace chromeos |
| OLD | NEW |