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

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

Issue 1262723002: Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits. Created 5 years, 4 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 <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 ui::ime::InputMethodMenuManager* manager) { 1241 ui::ime::InputMethodMenuManager* manager) {
1242 GetSystemTrayNotifier()->NotifyRefreshIME(); 1242 GetSystemTrayNotifier()->NotifyRefreshIME();
1243 } 1243 }
1244 1244
1245 // Overridden from CrasAudioHandler::AudioObserver. 1245 // Overridden from CrasAudioHandler::AudioObserver.
1246 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id, 1246 void SystemTrayDelegateChromeOS::OnOutputNodeVolumeChanged(uint64_t node_id,
1247 int volume) { 1247 int volume) {
1248 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume); 1248 GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged(node_id, volume);
1249 } 1249 }
1250 1250
1251 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on) { 1251 void SystemTrayDelegateChromeOS::OnOutputMuteChanged(bool mute_on,
1252 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on); 1252 bool system_adjust) {
1253 GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged(mute_on, system_adjust);
1253 } 1254 }
1254 1255
1255 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */, 1256 void SystemTrayDelegateChromeOS::OnInputNodeGainChanged(uint64_t /* node_id */,
1256 int /* gain */) { 1257 int /* gain */) {
1257 } 1258 }
1258 1259
1259 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) { 1260 void SystemTrayDelegateChromeOS::OnInputMuteChanged(bool /* mute_on */) {
1260 } 1261 }
1261 1262
1262 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() { 1263 void SystemTrayDelegateChromeOS::OnAudioNodesChanged() {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1417 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1417 << "ENABLE_SUPERVISED_USERS undefined."; 1418 << "ENABLE_SUPERVISED_USERS undefined.";
1418 return base::string16(); 1419 return base::string16();
1419 } 1420 }
1420 1421
1421 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1422 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1422 return new SystemTrayDelegateChromeOS(); 1423 return new SystemTrayDelegateChromeOS();
1423 } 1424 }
1424 1425
1425 } // namespace chromeos 1426 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/volume_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698