| 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/common/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_constants.h" | 8 #include "ash/common/shelf/shelf_constants.h" |
| 9 #include "ash/common/shelf/shelf_delegate.h" | 9 #include "ash/common/shelf/shelf_delegate.h" |
| 10 #include "ash/common/shelf/shelf_layout_manager.h" | 10 #include "ash/common/shelf/shelf_layout_manager.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "ui/display/display.h" | 26 #include "ui/display/display.h" |
| 27 #include "ui/events/event_utils.h" | 27 #include "ui/events/event_utils.h" |
| 28 #include "ui/views/view.h" | 28 #include "ui/views/view.h" |
| 29 #include "ui/views/widget/widget.h" | 29 #include "ui/views/widget/widget.h" |
| 30 | 30 |
| 31 namespace ash { | 31 namespace ash { |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 ShelfWidget* GetShelfWidget() { | 35 ShelfWidget* GetShelfWidget() { |
| 36 return test::AshTestBase::GetPrimaryShelf()->GetShelfWidgetForTesting(); | 36 return test::AshTestBase::GetPrimaryShelf()->shelf_widget(); |
| 37 } | 37 } |
| 38 | 38 |
| 39 ShelfLayoutManager* GetShelfLayoutManager() { | 39 ShelfLayoutManager* GetShelfLayoutManager() { |
| 40 return GetShelfWidget()->shelf_layout_manager(); | 40 return GetShelfWidget()->shelf_layout_manager(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 using ShelfWidgetTest = test::AshMDTestBase; | 45 using ShelfWidgetTest = test::AshMDTestBase; |
| 46 | 46 |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 } | 488 } |
| 489 | 489 |
| 490 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) { | 490 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) { |
| 491 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. | 491 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. |
| 492 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, | 492 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, |
| 493 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, | 493 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, |
| 494 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); | 494 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); |
| 495 } | 495 } |
| 496 | 496 |
| 497 } // namespace ash | 497 } // namespace ash |
| OLD | NEW |