diff options
| author | rockot <rockot@chromium.org> | 2014-09-15 16:58:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-16 00:00:44 +0000 |
| commit | 0b527c1ef9f0794742e8ea004fbaf7ecea2f4cef (patch) | |
| tree | 22afc4fc3b6737f921cfb3e20094cb22c8523f53 /ash/shelf | |
| parent | 19f0e7ff09a8c6692327869cf0716d686762a16b (diff) | |
| download | chromium_src-0b527c1ef9f0794742e8ea004fbaf7ecea2f4cef.zip chromium_src-0b527c1ef9f0794742e8ea004fbaf7ecea2f4cef.tar.gz chromium_src-0b527c1ef9f0794742e8ea004fbaf7ecea2f4cef.tar.bz2 | |
Revert of ash: Add checks for supervised users. (patchset #5 id:80001 of https://codereview.chromium.org/561713002/)
Reason for revert:
This is breaking NotificationApiTest.TestUserGesture, which assumes it starts with an empty notification list.
Somehow this is causing the browser test to be in a state where there is already a notification in the list regarding a supervised user.
Original issue's description:
> 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
>
> Committed: https://crrev.com/8616ac4cf7bd77f53dc001eb9d8d61c6c975eaaa
> Cr-Commit-Position: refs/heads/master@{#294821}
TBR=antrim@chromium.org,derat@chromium.org,jennyz@chromium.org,bauerb@chromium.org,treib@chromium.org,merkulova@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=394417
Review URL: https://codereview.chromium.org/575653002
Cr-Commit-Position: refs/heads/master@{#294934}
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_widget.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 2d89253..f912011 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -714,9 +714,6 @@ bool ShelfWidget::IsShelfHiddenBehindBlackBar() const { // static bool ShelfWidget::ShelfAlignmentAllowed() { - if (Shell::GetInstance()->system_tray_delegate()->IsUserSupervised()) - return false; - user::LoginStatus login_status = Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); |