ash/system/tray_accessibility.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/system/tray_accessibility.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/system/tray_accessibility.cc

diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc

index 3e866f8961e0ad1c783d5f434a9e0febda4f23f2..854e81cc5ed592d6101cbfa023b5219bf0a2c25a 100644

--- a/ash/system/tray_accessibility.cc

+++ b/ash/system/tray_accessibility.cc

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

#include "ash/accessibility_delegate.h"

#include "ash/accessibility_types.h"

#include "ash/resources/vector_icons/vector_icons.h"

+#include "ash/session/session_controller.h"

#include "ash/session/session_state_delegate.h"

#include "ash/shell.h"

#include "ash/shell_port.h"

@@ -14,7 +15,6 @@

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

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

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

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

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

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

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

@@ -91,7 +91,7 @@ uint32_t GetAccessibilityState() {

}

LoginStatus GetCurrentLoginStatus() {

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

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

}

} // namespace

« no previous file with comments | « ash/system/tray/system_tray_delegate.cc ('k') | ash/test/status_area_widget_test_helper.cc » ('j') | no next file with comments »