diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:09:41 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:09:41 +0000 |
| commit | c8d19f8b527b6e731cc88d89574dc9127e9a62ac (patch) | |
| tree | 03f18eeb52be5315dea606cb5756ad3e32429170 /ash/root_window_controller_unittest.cc | |
| parent | e519c435d39e453f532b1ba352ad2944c75895d8 (diff) | |
| download | chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.zip chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.tar.gz chromium_src-c8d19f8b527b6e731cc88d89574dc9127e9a62ac.tar.bz2 | |
Adding new user menu section to the SystemTrayMenu & refactoring of user access
It is still not fully finished - but it is functional and might be useful for what you are doing (and already quite big as it is). Note that the functionality is controlled by the flag.
What is missing?
- There are no unit tests yet
- The visual Drop down box to add a new user is missing.
- The error message box which shows the error if there are already 3 users signed in is missing.
- At the moment I have ~7 lines of test code in there which I will remove before I check in. (I need them since the multi login still does not work for me)
I am not sure if you want to wait until I finish the issue - or if you'd rather want to have this to be able to rather merge early then later. I leave this up to you. If you are for the latter one, you can have at least a look at my changes and if they conflict with yours.
BUG=239201
TEST=visual
Review URL: https://chromiumcodereview.appspot.com/14756019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller_unittest.cc')
| -rw-r--r-- | ash/root_window_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index b33e012..4a3351e 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(), |