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

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

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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 void InputMethodChanged(input_method::InputMethodManager* manager, 217 void InputMethodChanged(input_method::InputMethodManager* manager,
218 Profile* profile, 218 Profile* profile,
219 bool show_message) override; 219 bool show_message) override;
220 220
221 // Overridden from InputMethodMenuManager::Observer. 221 // Overridden from InputMethodMenuManager::Observer.
222 void InputMethodMenuItemChanged( 222 void InputMethodMenuItemChanged(
223 ui::ime::InputMethodMenuManager* manager) override; 223 ui::ime::InputMethodMenuManager* manager) override;
224 224
225 // Overridden from CrasAudioHandler::AudioObserver. 225 // Overridden from CrasAudioHandler::AudioObserver.
226 void OnOutputNodeVolumeChanged(uint64_t node_id, int volume) override; 226 void OnOutputNodeVolumeChanged(uint64_t node_id, int volume) override;
227 void OnOutputMuteChanged(bool mute_on) override; 227 void OnOutputMuteChanged(bool mute_on, bool system_adjust) override;
228 void OnInputNodeGainChanged(uint64_t node_id, int gain) override; 228 void OnInputNodeGainChanged(uint64_t node_id, int gain) override;
229 void OnInputMuteChanged(bool mute_on) override; 229 void OnInputMuteChanged(bool mute_on) override;
230 void OnAudioNodesChanged() override; 230 void OnAudioNodesChanged() override;
231 void OnActiveOutputNodeChanged() override; 231 void OnActiveOutputNodeChanged() override;
232 void OnActiveInputNodeChanged() override; 232 void OnActiveInputNodeChanged() override;
233 233
234 // Overridden from BluetoothAdapter::Observer. 234 // Overridden from BluetoothAdapter::Observer.
235 void AdapterPresentChanged(device::BluetoothAdapter* adapter, 235 void AdapterPresentChanged(device::BluetoothAdapter* adapter,
236 bool present) override; 236 bool present) override;
237 void AdapterPoweredChanged(device::BluetoothAdapter* adapter, 237 void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 315
316 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 316 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
317 317
318 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 318 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
319 }; 319 };
320 320
321 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 321 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
322 322
323 } // namespace chromeos 323 } // namespace chromeos
324 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 324 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698