| 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/launcher/launcher.h" | 7 #include "ash/launcher/launcher.h" |
| 8 #include "ash/launcher/launcher_button.h" | 8 #include "ash/launcher/launcher_button.h" |
| 9 #include "ash/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 { | 82 { |
| 83 SCOPED_TRACE("Single Left"); | 83 SCOPED_TRACE("Single Left"); |
| 84 TestLauncherAlignment(Shell::GetPrimaryRootWindow(), | 84 TestLauncherAlignment(Shell::GetPrimaryRootWindow(), |
| 85 SHELF_ALIGNMENT_LEFT, | 85 SHELF_ALIGNMENT_LEFT, |
| 86 "47,0 353x400"); | 86 "47,0 353x400"); |
| 87 } | 87 } |
| 88 if (!SupportsMultipleDisplays()) | 88 if (!SupportsMultipleDisplays()) |
| 89 return; | 89 return; |
| 90 | 90 |
| 91 UpdateDisplay("300x300,500x500"); | 91 UpdateDisplay("300x300,500x500"); |
| 92 Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); | 92 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); |
| 93 { | 93 { |
| 94 SCOPED_TRACE("Primary Bottom"); | 94 SCOPED_TRACE("Primary Bottom"); |
| 95 TestLauncherAlignment(root_windows[0], | 95 TestLauncherAlignment(root_windows[0], |
| 96 SHELF_ALIGNMENT_BOTTOM, | 96 SHELF_ALIGNMENT_BOTTOM, |
| 97 "0,0 300x253"); | 97 "0,0 300x253"); |
| 98 } | 98 } |
| 99 { | 99 { |
| 100 SCOPED_TRACE("Primary Right"); | 100 SCOPED_TRACE("Primary Right"); |
| 101 TestLauncherAlignment(root_windows[0], | 101 TestLauncherAlignment(root_windows[0], |
| 102 SHELF_ALIGNMENT_RIGHT, | 102 SHELF_ALIGNMENT_RIGHT, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 const int status_width = | 185 const int status_width = |
| 186 shelf->status_area_widget()->GetWindowBoundsInScreen().width(); | 186 shelf->status_area_widget()->GetWindowBoundsInScreen().width(); |
| 187 EXPECT_GT(status_width, 0); | 187 EXPECT_GT(status_width, 0); |
| 188 EXPECT_EQ(status_width, | 188 EXPECT_EQ(status_width, |
| 189 shelf->GetContentsView()->width() - | 189 shelf->GetContentsView()->width() - |
| 190 test::LauncherTestAPI(launcher).shelf_view()->width()); | 190 test::LauncherTestAPI(launcher).shelf_view()->width()); |
| 191 } | 191 } |
| 192 #endif | 192 #endif |
| 193 | 193 |
| 194 } // namespace ash | 194 } // namespace ash |
| OLD | NEW |