OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <algorithm> | 5 #include <algorithm> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "ash/common/accessibility_delegate.h" | 8 #include "ash/common/accessibility_delegate.h" |
9 #include "ash/common/accessibility_types.h" | 9 #include "ash/common/accessibility_types.h" |
10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 if (WmShell::Get()->IsRunningInMash()) | 933 if (WmShell::Get()->IsRunningInMash()) |
934 return; | 934 return; |
935 | 935 |
936 gfx::Rect bounds(0, 0, 400, 400); | 936 gfx::Rect bounds(0, 0, 400, 400); |
937 std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); | 937 std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); |
938 std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); | 938 std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); |
939 | 939 |
940 // The tested behavior relies on the app list presenter delegate. | 940 // The tested behavior relies on the app list presenter delegate. |
941 test::TestAppListViewPresenterImpl app_list_presenter_impl; | 941 test::TestAppListViewPresenterImpl app_list_presenter_impl; |
942 | 942 |
943 app_list_presenter_impl.Show(display_manager()->first_display_id()); | 943 app_list_presenter_impl.Show( |
| 944 display::Screen::GetScreen()->GetPrimaryDisplay().id()); |
944 EXPECT_TRUE(app_list_presenter_impl.IsVisible()); | 945 EXPECT_TRUE(app_list_presenter_impl.IsVisible()); |
945 | 946 |
946 ToggleOverview(); | 947 ToggleOverview(); |
947 EXPECT_FALSE(app_list_presenter_impl.IsVisible()); | 948 EXPECT_FALSE(app_list_presenter_impl.IsVisible()); |
948 ToggleOverview(); | 949 ToggleOverview(); |
949 } | 950 } |
950 | 951 |
951 // Tests that a minimized window's visibility and layer visibility is correctly | 952 // Tests that a minimized window's visibility and layer visibility is correctly |
952 // changed when entering overview and restored when leaving overview mode. | 953 // changed when entering overview and restored when leaving overview mode. |
953 // Crashes after the skia roll in http://crrev.com/274114. | 954 // Crashes after the skia roll in http://crrev.com/274114. |
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1853 aura::client::WINDOW_MOVE_SOURCE_MOUSE)); | 1854 aura::client::WINDOW_MOVE_SOURCE_MOUSE)); |
1854 ASSERT_TRUE(resizer.get()); | 1855 ASSERT_TRUE(resizer.get()); |
1855 gfx::Point location = resizer->GetInitialLocation(); | 1856 gfx::Point location = resizer->GetInitialLocation(); |
1856 location.Offset(20, 20); | 1857 location.Offset(20, 20); |
1857 resizer->Drag(location, 0); | 1858 resizer->Drag(location, 0); |
1858 ToggleOverview(); | 1859 ToggleOverview(); |
1859 resizer->RevertDrag(); | 1860 resizer->RevertDrag(); |
1860 } | 1861 } |
1861 | 1862 |
1862 } // namespace ash | 1863 } // namespace ash |
OLD | NEW |