| 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/content/keyboard_overlay/keyboard_overlay_delegate.h" | 5 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h" |
| 6 | 6 |
| 7 #include "ash/shelf/shelf_types.h" | 7 #include "ash/shelf/shelf_types.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 // Clean up. | 57 // Clean up. |
| 58 widget->CloseNow(); | 58 widget->CloseNow(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 // Tests run three times - for all possible values of shelf alignment | 61 // Tests run three times - for all possible values of shelf alignment |
| 62 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny, | 62 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny, |
| 63 KeyboardOverlayDelegateTest, | 63 KeyboardOverlayDelegateTest, |
| 64 testing::Values(SHELF_ALIGNMENT_BOTTOM, | 64 testing::Values(SHELF_ALIGNMENT_BOTTOM, |
| 65 SHELF_ALIGNMENT_LEFT, | 65 SHELF_ALIGNMENT_LEFT, |
| 66 SHELF_ALIGNMENT_RIGHT)); | 66 SHELF_ALIGNMENT_RIGHT, |
| 67 SHELF_ALIGNMENT_LOCKED)); |
| 67 | 68 |
| 68 } // namespace ash | 69 } // namespace ash |
| OLD | NEW |