chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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 | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 6ebf22d1550e94e5626530b1c58f0b7d6a55faeb..1ba70edb392be3f5ab9605b464811595407a4abe 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -16,6 +16,7 @@

#include "ash/common/login_status.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/session/session_state_observer.h"

+#include "ash/common/shell_delegate.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"

#include "ash/common/system/chromeos/power/power_status.h"

@@ -32,7 +33,6 @@

#include "ash/common/wm_shell.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "ash/system/tray/system_tray.h"

#include "ash/wm/lock_state_controller.h"

#include "base/bind_helpers.h"

@@ -547,9 +547,8 @@ void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {

}

void SystemTrayDelegateChromeOS::ShowUserLogin() {

- ash::Shell* shell = ash::Shell::GetInstance();

ash::WmShell* wm_shell = ash::WmShell::Get();

- if (!shell->delegate()->IsMultiProfilesEnabled())

+ if (!wm_shell->delegate()->IsMultiProfilesEnabled())

return;

// Only regular non-supervised users could add other users to current session.