ash/root_window_controller_unittest.cc - Issue 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access

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/root_window_controller_unittest.cc

Issue 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More windows breakages addressed Created 7 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/root_window_controller_unittest.cc

diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc

index b33e01262a046d4a8454782252191d228e4aa6c8..4a3351e5ad479fb008499ff001fcee001c513de9 100644

--- a/ash/root_window_controller_unittest.cc

+++ b/ash/root_window_controller_unittest.cc

@@ -327,7 +327,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {

SetUserLoggedIn(false);

EXPECT_EQ(user::LOGGED_IN_NONE,

shell->system_tray_delegate()->GetUserLoginStatus());

- EXPECT_FALSE(shell->session_state_delegate()->HasActiveUser());

+ EXPECT_EQ(0, shell->session_state_delegate()->NumberOfLoggedInUsers());

EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());

internal::RootWindowController* controller =

@@ -352,7 +352,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {

SetSessionStarted(true);

EXPECT_EQ(user::LOGGED_IN_USER,

shell->system_tray_delegate()->GetUserLoginStatus());

- EXPECT_TRUE(shell->session_state_delegate()->HasActiveUser());

+ EXPECT_EQ(1, shell->session_state_delegate()->NumberOfLoggedInUsers());

EXPECT_TRUE(shell->session_state_delegate()->IsActiveUserSessionStarted());

EXPECT_EQ(Shell::GetContainer(controller->root_window(),

internal::kShellWindowId_SystemModalContainer)->layout_manager(),

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/session_state_delegate.h » ('j') | ash/session_state_delegate.h » ('J')