| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shelf/shelf_widget.h" | 5 #include "ash/shelf/shelf_widget.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/focus_cycler.h" | 8 #include "ash/focus_cycler.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 switch (login_status) { | 712 switch (login_status) { |
| 713 case user::LOGGED_IN_LOCKED: | 713 case user::LOGGED_IN_LOCKED: |
| 714 // Shelf alignment changes can be requested while being locked, but will | 714 // Shelf alignment changes can be requested while being locked, but will |
| 715 // be applied upon unlock. | 715 // be applied upon unlock. |
| 716 case user::LOGGED_IN_USER: | 716 case user::LOGGED_IN_USER: |
| 717 case user::LOGGED_IN_OWNER: | 717 case user::LOGGED_IN_OWNER: |
| 718 return true; | 718 return true; |
| 719 case user::LOGGED_IN_PUBLIC: | 719 case user::LOGGED_IN_PUBLIC: |
| 720 case user::LOGGED_IN_SUPERVISED: | 720 case user::LOGGED_IN_SUPERVISED: |
| 721 case user::LOGGED_IN_GUEST: | 721 case user::LOGGED_IN_GUEST: |
| 722 case user::LOGGED_IN_RETAIL_MODE: | |
| 723 case user::LOGGED_IN_KIOSK_APP: | 722 case user::LOGGED_IN_KIOSK_APP: |
| 724 case user::LOGGED_IN_NONE: | 723 case user::LOGGED_IN_NONE: |
| 725 return false; | 724 return false; |
| 726 } | 725 } |
| 727 | 726 |
| 728 DCHECK(false); | 727 DCHECK(false); |
| 729 return false; | 728 return false; |
| 730 } | 729 } |
| 731 | 730 |
| 732 ShelfAlignment ShelfWidget::GetAlignment() const { | 731 ShelfAlignment ShelfWidget::GetAlignment() const { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 DCHECK(delegate_view_); | 829 DCHECK(delegate_view_); |
| 831 return delegate_view_->disable_dimming_animations_for_test(); | 830 return delegate_view_->disable_dimming_animations_for_test(); |
| 832 } | 831 } |
| 833 | 832 |
| 834 void ShelfWidget::WillDeleteShelf() { | 833 void ShelfWidget::WillDeleteShelf() { |
| 835 shelf_layout_manager_->RemoveObserver(this); | 834 shelf_layout_manager_->RemoveObserver(this); |
| 836 shelf_layout_manager_ = NULL; | 835 shelf_layout_manager_ = NULL; |
| 837 } | 836 } |
| 838 | 837 |
| 839 } // namespace ash | 838 } // namespace ash |
| OLD | NEW |