| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/shelf/shelf_delegate.h" |
| 8 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 9 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
| 10 #include "ash/shelf/shelf_delegate.h" | |
| 11 #include "ash/shelf/shelf_layout_manager.h" | 11 #include "ash/shelf/shelf_layout_manager.h" |
| 12 #include "ash/shelf/shelf_view.h" | 12 #include "ash/shelf/shelf_view.h" |
| 13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "ash/test/ash_md_test_base.h" | 14 #include "ash/test/ash_md_test_base.h" |
| 15 #include "ash/test/ash_test_helper.h" | 15 #include "ash/test/ash_test_helper.h" |
| 16 #include "ash/test/shelf_test_api.h" | 16 #include "ash/test/shelf_test_api.h" |
| 17 #include "ash/test/shelf_view_test_api.h" | 17 #include "ash/test/shelf_view_test_api.h" |
| 18 #include "ash/test/test_shell_delegate.h" | 18 #include "ash/test/test_shell_delegate.h" |
| 19 #include "ash/wm/window_util.h" | 19 #include "ash/wm/window_util.h" |
| 20 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 } | 478 } |
| 479 | 479 |
| 480 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) { | 480 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) { |
| 481 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. | 481 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. |
| 482 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, | 482 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, |
| 483 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, | 483 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, |
| 484 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); | 484 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); |
| 485 } | 485 } |
| 486 | 486 |
| 487 } // namespace ash | 487 } // namespace ash |
| OLD | NEW |