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

Unified Diff: ash/system/tray/system_tray_controller.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_controller.cc
diff --git a/ash/system/tray/system_tray_controller.cc b/ash/system/tray/system_tray_controller.cc
index 41854e81f7066372868a9bb2aa638165ebfcabab..a3232bdb6446174251a8a66baf75ec9f9c63c2f4 100644
--- a/ash/system/tray/system_tray_controller.cc
+++ b/ash/system/tray/system_tray_controller.cc
@@ -10,7 +10,6 @@
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/update/tray_update.h"
-#include "ash/wm_window.h"
namespace ash {
@@ -217,8 +216,8 @@ void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
void SystemTrayController::ShowUpdateOverCellularAvailableIcon() {
// Show the icon on all displays.
- for (WmWindow* root : ShellPort::Get()->GetAllRootWindows()) {
- ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
+ for (auto* root_window_controller : Shell::GetAllRootWindowControllers()) {
+ ash::SystemTray* tray = root_window_controller->GetSystemTray();
// External monitors might not have a tray yet.
if (!tray)
continue;
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698