ash/system/tray/system_tray_controller.cc - Issue 2886253002: mash: remove more shell/shelf WmWindow usage.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)

Patch Set: Fix WmShelf::ForWindow. 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:

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 c2ba4b72bcaea78c05b316bedb3a6ddf5825420e..15db806d9023daad503aaf3ce1a0cbc8b03adef2 100644

--- a/ash/system/tray/system_tray_controller.cc

+++ b/ash/system/tray/system_tray_controller.cc

@@ -151,7 +151,7 @@ void SystemTrayController::SetClient(mojom::SystemTrayClientPtr client) {

void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {

ash::SystemTray* tray =

- ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();

+ Shell::GetPrimaryRootWindowController()->GetSystemTray();

if (!tray)

return;

@@ -170,7 +170,7 @@ void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {

void SystemTrayController::SetPrimaryTrayVisible(bool visible) {

ash::SystemTray* tray =

- ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();

+ Shell::GetPrimaryRootWindowController()->GetSystemTray();

if (!tray)

return;

« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »