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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 1150
1151 // Overridden from InputMethodMenuManager::Observer. 1151 // Overridden from InputMethodMenuManager::Observer.
1152 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged( 1152 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
1153 ui::ime::InputMethodMenuManager* manager) { 1153 ui::ime::InputMethodMenuManager* manager) {
1154 GetWmSystemTrayNotifier()->NotifyRefreshIME(); 1154 GetWmSystemTrayNotifier()->NotifyRefreshIME();
1155 } 1155 }
1156 1156
1157 // Overridden from CrasAudioHandler::AudioObserver. 1157 // Overridden from CrasAudioHandler::AudioObserver.
1158 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id, 1158 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id,
1159 int volume) { 1159 int volume) {
1160 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume); 1160 GetWmSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume);
1161 } 1161 }
1162 1162
1163 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on, 1163 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on,
1164 bool system_adjust) { 1164 bool system_adjust) {
1165 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on, system_adjust); 1165 GetWmSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on,
1166 system_adjust);
1166 } 1167 }
1167 1168
1168 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */, 1169 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */,
1169 int /* gain */) { 1170 int /* gain */) {
1170 } 1171 }
1171 1172
1172 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) { 1173 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) {
1173 } 1174 }
1174 1175
1175 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() { 1176 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() {
1176 GetSystemTrayNotifier()->NotifyAudioNodesChanged(); 1177 GetWmSystemTrayNotifier()->NotifyAudioNodesChanged();
1177 } 1178 }
1178 1179
1179 void SystemTrayDelegateChromeOS::OnActiveOutputNodeChanged() { 1180 void SystemTrayDelegateChromeOS::OnActiveOutputNodeChanged() {
1180 GetSystemTrayNotifier()->NotifyAudioActiveOutputNodeChanged(); 1181 GetWmSystemTrayNotifier()->NotifyAudioActiveOutputNodeChanged();
1181 } 1182 }
1182 1183
1183 void SystemTrayDelegateChromeOS::OnActiveInputNodeChanged() { 1184 void SystemTrayDelegateChromeOS::OnActiveInputNodeChanged() {
1184 GetSystemTrayNotifier()->NotifyAudioActiveInputNodeChanged(); 1185 GetWmSystemTrayNotifier()->NotifyAudioActiveInputNodeChanged();
1185 } 1186 }
1186 1187
1187 // Overridden from BluetoothAdapter::Observer. 1188 // Overridden from BluetoothAdapter::Observer.
1188 void SystemTrayDelegateChromeOS::AdapterPresentChanged( 1189 void SystemTrayDelegateChromeOS::AdapterPresentChanged(
1189 device::BluetoothAdapter* adapter, 1190 device::BluetoothAdapter* adapter,
1190 bool present) { 1191 bool present) {
1191 GetSystemTrayNotifier()->NotifyRefreshBluetooth(); 1192 GetSystemTrayNotifier()->NotifyRefreshBluetooth();
1192 } 1193 }
1193 1194
1194 void SystemTrayDelegateChromeOS::AdapterPoweredChanged( 1195 void SystemTrayDelegateChromeOS::AdapterPoweredChanged(
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1338 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1338 << "ENABLE_SUPERVISED_USERS undefined."; 1339 << "ENABLE_SUPERVISED_USERS undefined.";
1339 return base::string16(); 1340 return base::string16();
1340 } 1341 }
1341 1342
1342 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1343 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1343 return new SystemTrayDelegateChromeOS(); 1344 return new SystemTrayDelegateChromeOS();
1344 } 1345 }
1345 1346
1346 } // namespace chromeos 1347 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | components/arc/audio/arc_audio_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698