OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/common/shelf/wm_shelf.h" | 5 #include "ash/common/shelf/wm_shelf.h" |
6 | 6 |
7 #include "ash/common/shelf/shelf_controller.h" | 7 #include "ash/common/shelf/shelf_controller.h" |
8 #include "ash/common/shelf/shelf_delegate.h" | 8 #include "ash/common/shelf/shelf_delegate.h" |
9 #include "ash/common/shelf/shelf_item_delegate.h" | 9 #include "ash/common/shelf/shelf_item_delegate.h" |
10 #include "ash/common/shelf/shelf_layout_manager.h" | 10 #include "ash/common/shelf/shelf_layout_manager.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 case LoginStatus::LOCKED: | 40 case LoginStatus::LOCKED: |
41 // Shelf alignment changes can be requested while being locked, but will | 41 // Shelf alignment changes can be requested while being locked, but will |
42 // be applied upon unlock. | 42 // be applied upon unlock. |
43 case LoginStatus::USER: | 43 case LoginStatus::USER: |
44 case LoginStatus::OWNER: | 44 case LoginStatus::OWNER: |
45 return true; | 45 return true; |
46 case LoginStatus::PUBLIC: | 46 case LoginStatus::PUBLIC: |
47 case LoginStatus::SUPERVISED: | 47 case LoginStatus::SUPERVISED: |
48 case LoginStatus::GUEST: | 48 case LoginStatus::GUEST: |
49 case LoginStatus::KIOSK_APP: | 49 case LoginStatus::KIOSK_APP: |
| 50 case LoginStatus::ARC_KIOSK_APP: |
50 case LoginStatus::NOT_LOGGED_IN: | 51 case LoginStatus::NOT_LOGGED_IN: |
51 return false; | 52 return false; |
52 } | 53 } |
53 | 54 |
54 NOTREACHED(); | 55 NOTREACHED(); |
55 return false; | 56 return false; |
56 } | 57 } |
57 | 58 |
58 void WmShelf::CreateShelfWidget(WmWindow* root) { | 59 void WmShelf::CreateShelfWidget(WmWindow* root) { |
59 DCHECK(!shelf_widget_); | 60 DCHECK(!shelf_widget_); |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 326 |
326 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, | 327 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, |
327 BackgroundAnimatorChangeType change_type) { | 328 BackgroundAnimatorChangeType change_type) { |
328 if (background_type == GetBackgroundType()) | 329 if (background_type == GetBackgroundType()) |
329 return; | 330 return; |
330 for (auto& observer : observers_) | 331 for (auto& observer : observers_) |
331 observer.OnBackgroundTypeChanged(background_type, change_type); | 332 observer.OnBackgroundTypeChanged(background_type, change_type); |
332 } | 333 } |
333 | 334 |
334 } // namespace ash | 335 } // namespace ash |
OLD | NEW |