diff options
author | merkulova <merkulova@chromium.org> | 2014-09-15 07:30:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-15 15:02:21 +0000 |
commit | 8616ac4cf7bd77f53dc001eb9d8d61c6c975eaaa (patch) | |
tree | 632d15195ef9ee743f3b201a8578d1e0db83c6fa /ash/test | |
parent | 7fbd268a3a16430495ad9bd558abecdf279bf62a (diff) | |
download | chromium_src-8616ac4cf7bd77f53dc001eb9d8d61c6c975eaaa.zip chromium_src-8616ac4cf7bd77f53dc001eb9d8d61c6c975eaaa.tar.gz chromium_src-8616ac4cf7bd77f53dc001eb9d8d61c6c975eaaa.tar.bz2 |
ash: Add checks for supervised users.
Propagate the user's supervised state to the ash system
so that it becomes available for views
https://chromereviews.googleplex.com/79527013/
BUG=394417
Review URL: https://codereview.chromium.org/561713002
Cr-Commit-Position: refs/heads/master@{#294821}
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/test_system_tray_delegate.cc | 5 | ||||
-rw-r--r-- | ash/test/test_system_tray_delegate.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc index c4a45b9..60fb4b3 100644 --- a/ash/test/test_system_tray_delegate.cc +++ b/ash/test/test_system_tray_delegate.cc @@ -8,6 +8,7 @@ #include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "ash/system/user/login_status.h" #include "base/message_loop/message_loop.h" #include "base/time/time.h" @@ -69,6 +70,10 @@ user::LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const { return login_status_; } +bool TestSystemTrayDelegate::IsUserSupervised() const { + return login_status_ == ash::user::LOGGED_IN_SUPERVISED; +} + bool TestSystemTrayDelegate::ShouldShowDisplayNotification() { return should_show_display_notification_; } diff --git a/ash/test/test_system_tray_delegate.h b/ash/test/test_system_tray_delegate.h index 9b85d97..1a64ac1 100644 --- a/ash/test/test_system_tray_delegate.h +++ b/ash/test/test_system_tray_delegate.h @@ -43,6 +43,7 @@ class TestSystemTrayDelegate : public DefaultSystemTrayDelegate { // Overridden from SystemTrayDelegate: virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE; + virtual bool IsUserSupervised() const OVERRIDE; virtual bool ShouldShowDisplayNotification() OVERRIDE; virtual bool GetSessionStartTime( base::TimeTicks* session_start_time) OVERRIDE; |