| 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/common/shelf/shelf_widget.h" | 5 #include "ash/shelf/shelf_widget.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_constants.h" | |
| 8 #include "ash/common/shelf/shelf_layout_manager.h" | |
| 9 #include "ash/common/shelf/shelf_view.h" | |
| 10 #include "ash/common/shelf/wm_shelf.h" | |
| 11 #include "ash/common/wm_shell.h" | |
| 12 #include "ash/common/wm_window.h" | |
| 13 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_constants.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shelf/shelf_view.h" |
| 11 #include "ash/shelf/wm_shelf.h" |
| 14 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 15 #include "ash/system/status_area_widget.h" | 13 #include "ash/system/status_area_widget.h" |
| 16 #include "ash/test/ash_test_base.h" | 14 #include "ash/test/ash_test_base.h" |
| 17 #include "ash/test/ash_test_helper.h" | 15 #include "ash/test/ash_test_helper.h" |
| 18 #include "ash/test/shelf_view_test_api.h" | 16 #include "ash/test/shelf_view_test_api.h" |
| 19 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
| 18 #include "ash/wm_shell.h" |
| 19 #include "ash/wm_window.h" |
| 20 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
| 21 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
| 22 #include "ui/events/event_utils.h" | 22 #include "ui/events/event_utils.h" |
| 23 #include "ui/views/view.h" | 23 #include "ui/views/view.h" |
| 24 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
| 25 | 25 |
| 26 namespace ash { | 26 namespace ash { |
| 27 | 27 |
| 28 namespace { | 28 namespace { |
| 29 | 29 |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 } | 408 } |
| 409 | 409 |
| 410 TEST_F(ShelfWidgetTestWithInitializer, CreateLockedShelf) { | 410 TEST_F(ShelfWidgetTestWithInitializer, CreateLockedShelf) { |
| 411 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. | 411 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. |
| 412 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, | 412 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, |
| 413 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, | 413 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, |
| 414 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); | 414 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace ash | 417 } // namespace ash |
| OLD | NEW |