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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
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 3d319b3b3c99b51bf0796747e66d53c398be57b6..022f97a1dc3070c655d5cfd4c8247ed85fed688d 100644
--- a/ash/system/tray/system_tray_controller.cc
+++ b/ash/system/tray/system_tray_controller.cc
@@ -6,10 +6,10 @@
#include "ash/root_window_controller.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#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_shell.h"
#include "ash/wm_window.h"
namespace ash {
@@ -146,7 +146,7 @@ void SystemTrayController::SetClient(mojom::SystemTrayClientPtr client) {
void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {
ash::SystemTray* tray =
- WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+ ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();
if (!tray)
return;
@@ -165,7 +165,7 @@ void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {
void SystemTrayController::SetPrimaryTrayVisible(bool visible) {
ash::SystemTray* tray =
- WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+ ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();
if (!tray)
return;
@@ -186,7 +186,7 @@ void SystemTrayController::SetUse24HourClock(bool use_24_hour) {
void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
bool factory_reset_required) {
// Show the icon on all displays.
- for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
+ for (WmWindow* root : ShellPort::Get()->GetAllRootWindows()) {
ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
// External monitors might not have a tray yet.
if (!tray)

Powered by Google App Engine
This is Rietveld 408576698