Chromium Code Reviews| Index: ash/system/audio/tray_audio.cc |
| diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc |
| index ebab30950c009e0ba392d2d08c1210767bccda85..b6787ecea2d27656b7b601830be7b4424543a9e5 100644 |
| --- a/ash/system/audio/tray_audio.cc |
| +++ b/ash/system/audio/tray_audio.cc |
| @@ -6,12 +6,12 @@ |
| #include "ash/resources/vector_icons/vector_icons.h" |
| #include "ash/root_window_controller.h" |
| +#include "ash/shell.h" |
| #include "ash/shell_port.h" |
| #include "ash/system/audio/audio_detailed_view.h" |
| #include "ash/system/audio/volume_view.h" |
| #include "ash/system/tray/system_tray.h" |
| #include "ash/system/tray/tray_constants.h" |
| -#include "ash/wm_window.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| #include "ui/display/display.h" |
| #include "ui/display/manager/managed_display_info.h" |
| @@ -44,8 +44,8 @@ TrayAudio::~TrayAudio() { |
| // static |
| void TrayAudio::ShowPopUpVolumeView() { |
| // Show the popup on all monitors with a system tray. |
| - for (WmWindow* root : ShellPort::Get()->GetAllRootWindows()) { |
| - SystemTray* system_tray = root->GetRootWindowController()->GetSystemTray(); |
| + for (RootWindowController* root : Shell::GetAllRootWindowControllers()) { |
|
James Cook
2017/05/16 22:44:44
Do we prefer this, RootWindowController::root_wind
sky
2017/05/17 16:12:40
I would like to move to where ShellPort usage is v
|
| + SystemTray* system_tray = root->GetSystemTray(); |
| if (!system_tray) |
| continue; |
| // Show the popup by simulating a volume change. The provided node id and |