Support for showing/hiding status area volume controls in desktop devices

chrome/browser/chromeos/system_key_event_listener.cc

Index: chrome/browser/chromeos/system_key_event_listener.cc
===================================================================
--- chrome/browser/chromeos/system_key_event_listener.cc	(revision 119932)
+++ chrome/browser/chromeos/system_key_event_listener.cc	(working copy)
@@ -152,13 +152,6 @@
   stopped_ = true;
 }
 
-AudioHandler* SystemKeyEventListener::GetAudioHandler() const {
-  AudioHandler* audio_handler = AudioHandler::GetInstance();
-  if (!audio_handler || !audio_handler->IsInitialized())
-    return NULL;
-  return audio_handler;
-}
-
 void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) {
   caps_lock_observers_.AddObserver(observer);
 }
@@ -213,7 +206,7 @@
 }
 
 void SystemKeyEventListener::OnVolumeMute() {
-  AudioHandler* audio_handler = GetAudioHandler();
+  AudioHandler* audio_handler = AudioHandler::GetInstanceIfInitialized();
   if (!audio_handler)
     return;
 
@@ -227,7 +220,7 @@
 }
 
 void SystemKeyEventListener::OnVolumeDown() {
-  AudioHandler* audio_handler = GetAudioHandler();
+  AudioHandler* audio_handler = AudioHandler::GetInstanceIfInitialized();
   if (!audio_handler)
     return;
 
@@ -242,7 +235,7 @@
 }
 
 void SystemKeyEventListener::OnVolumeUp() {
-  AudioHandler* audio_handler = GetAudioHandler();
+  AudioHandler* audio_handler = AudioHandler::GetInstanceIfInitialized();
   if (!audio_handler)
     return;
 
@@ -260,12 +253,13 @@
 }
 
 void SystemKeyEventListener::OnCapsLock(bool enabled) {
-  FOR_EACH_OBSERVER(
-      CapsLockObserver, caps_lock_observers_, OnCapsLockChange(enabled));
+  FOR_EACH_OBSERVER(CapsLockObserver,
+                    caps_lock_observers_,
+                    OnCapsLockChange(enabled));
 }
 
 void SystemKeyEventListener::ShowVolumeBubble() {
-  AudioHandler* audio_handler = GetAudioHandler();
+  AudioHandler* audio_handler = AudioHandler::GetInstanceIfInitialized();
   if (audio_handler) {
     VolumeBubble::GetInstance()->ShowBubble(
         audio_handler->GetVolumePercent(),