ash/common/system/tray/tray_popup_utils.cc - Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate

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/common/system/tray/tray_popup_utils.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)

Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/common/system/tray/tray_popup_utils.cc

diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc

index 4e065c68513f392ff53e0d993246dc447dbd31fe..d1227bec2c3d434b4b18b5ece5836d164a8ae814 100644

--- a/ash/common/system/tray/tray_popup_utils.cc

+++ b/ash/common/system/tray/tray_popup_utils.cc

@@ -9,7 +9,7 @@

#include "ash/common/ash_constants.h"

#include "ash/common/ash_view_ids.h"

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

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

#include "ash/common/system/tray/fixed_sized_image_view.h"

#include "ash/common/system/tray/size_range_layout.h"

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

@@ -431,7 +431,7 @@ bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {

// ShowSettings() method.

return status != LoginStatus::NOT_LOGGED_IN &&

status != LoginStatus::LOCKED &&

- !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();

+ !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen();

}

} // namespace ash

« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/user/login_status.cc » ('j') | no next file with comments »