chromeos: Make system tray audio item observe CrasAudioHandler directly

ash/common/system/chromeos/audio/tray_audio.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/audio/tray_audio.h"
 
 #include "ash/common/system/chromeos/audio/audio_detailed_view.h"
 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"
 #include "ash/common/system/chromeos/audio/volume_view.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "grit/ash_resources.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
+using chromeos::CrasAudioHandler;
 using chromeos::DBusThreadManager;
 using system::TrayAudioDelegate;
 using system::TrayAudioDelegateChromeOs;
 
 TrayAudio::TrayAudio(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE, UMA_AUDIO),
       audio_delegate_(new TrayAudioDelegateChromeOs()),
       volume_view_(nullptr),
       pop_up_volume_view_(false),
       audio_detail_view_(nullptr) {
-  WmShell::Get()->system_tray_notifier()->AddAudioObserver(this);
+  if (CrasAudioHandler::IsInitialized())
+    CrasAudioHandler::Get()->AddAudioObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 }
 
 TrayAudio::~TrayAudio() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
-  WmShell::Get()->system_tray_notifier()->RemoveAudioObserver(this);
+  if (CrasAudioHandler::IsInitialized())
+    CrasAudioHandler::Get()->RemoveAudioObserver(this);
+}
+
+// static
+void TrayAudio::ShowPopUpVolumeView() {
+  // Show the popup on all monitors with a system tray.
+  for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
+    SystemTray* system_tray = root->GetRootWindowController()->GetSystemTray();
+    if (!system_tray)
+      continue;
+    // Show the popup by simulating a volume change. The provided node id and
+    // volume value are ignored.
+    system_tray->GetTrayAudio()->OnOutputNodeVolumeChanged(0, 0);
+  }
 }
 
 bool TrayAudio::GetInitialVisibility() {
   return audio_delegate_->IsOutputAudioMuted();
 }
 
 views::View* TrayAudio::CreateDefaultView(LoginStatus status) {
   volume_view_ = new tray::VolumeView(this, audio_delegate_.get(), true);
   return volume_view_;
 }
@@ skipping 25 matching lines @@
 
 bool TrayAudio::ShouldHideArrow() const {
   return true;
 }
 
 bool TrayAudio::ShouldShowShelf() const {
   return !pop_up_volume_view_;
 }
 
 void TrayAudio::OnOutputNodeVolumeChanged(uint64_t /* node_id */,
-                                          double /* volume */) {
+                                          int /* volume */) {
   float percent =
       static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f;
   if (tray_view())
     tray_view()->SetVisible(GetInitialVisibility());
 
   if (volume_view_) {
     volume_view_->SetVolumeLevel(percent);
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
     return;
   }
@@ skipping 90 matching lines @@
     volume_view_->SetVolumeLevel(
         static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
     volume_view_->Update();
   }
 
   if (audio_detail_view_)
     audio_detail_view_->Update();
 }
 
 }  // namespace ash