OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/shell_window_ids.h" | |
6 #include "ash/common/wm/window_state.h" | 5 #include "ash/common/wm/window_state.h" |
7 #include "ash/display/display_manager.h" | 6 #include "ash/display/display_manager.h" |
| 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
12 #include "ash/wm/window_state_aura.h" | 12 #include "ash/wm/window_state_aura.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "ui/aura/client/aura_constants.h" | 14 #include "ui/aura/client/aura_constants.h" |
15 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
16 #include "ui/display/screen.h" | 16 #include "ui/display/screen.h" |
17 #include "ui/keyboard/keyboard_controller.h" | 17 #include "ui/keyboard/keyboard_controller.h" |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); | 290 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); |
291 window->SetBounds(work_area); | 291 window->SetBounds(work_area); |
292 // Usually work_area takes Shelf into account but that doesn't affect | 292 // Usually work_area takes Shelf into account but that doesn't affect |
293 // LockScreen container windows. | 293 // LockScreen container windows. |
294 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); | 294 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); |
295 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); | 295 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); |
296 } | 296 } |
297 | 297 |
298 } // namespace test | 298 } // namespace test |
299 } // namespace ash | 299 } // namespace ash |
OLD | NEW |