ash/shelf/wm_shelf.cc - Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus

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/shelf/wm_shelf.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)

Patch Set: update PaletteTray to exclude ARC kiosk 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/shelf/wm_shelf.cc

diff --git a/ash/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc

index bd0cbd65dbe757d9708de4f9cedfa0a94660ec75..6abaf16ab8075c8dd9c56c24ab28d08efcad4597 100644

--- a/ash/shelf/wm_shelf.cc

+++ b/ash/shelf/wm_shelf.cc

@@ -17,7 +17,6 @@

#include "ash/shelf/shelf_widget.h"

#include "ash/shelf/wm_shelf_observer.h"

#include "ash/shell.h"

-#include "ash/system/tray/system_tray_delegate.h"

#include "ash/wm_window.h"

#include "base/logging.h"

#include "base/memory/ptr_util.h"

@@ -79,8 +78,8 @@ bool WmShelf::CanChangeShelfAlignment() {

if (Shell::Get()->session_controller()->IsUserSupervised())

return false;

- LoginStatus login_status =

- Shell::Get()->system_tray_delegate()->GetUserLoginStatus();

+ const LoginStatus login_status =

+ Shell::Get()->session_controller()->login_status();

switch (login_status) {

case LoginStatus::LOCKED:

« no previous file with comments | « ash/session/session_controller.cc ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »