| 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" |
| 5 #include "ash/common/wm/window_state.h" | 6 #include "ash/common/wm/window_state.h" |
| 6 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
| 7 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 8 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
| 9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.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" |
| 18 #include "ui/keyboard/keyboard_switches.h" | 18 #include "ui/keyboard/keyboard_switches.h" |
| 19 #include "ui/keyboard/keyboard_ui.h" | 19 #include "ui/keyboard/keyboard_ui.h" |
| 20 #include "ui/keyboard/keyboard_util.h" | 20 #include "ui/keyboard/keyboard_util.h" |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); | 296 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); |
| 297 window->SetBounds(work_area); | 297 window->SetBounds(work_area); |
| 298 // Usually work_area takes Shelf into account but that doesn't affect | 298 // Usually work_area takes Shelf into account but that doesn't affect |
| 299 // LockScreen container windows. | 299 // LockScreen container windows. |
| 300 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); | 300 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); |
| 301 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); | 301 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); |
| 302 } | 302 } |
| 303 | 303 |
| 304 } // namespace test | 304 } // namespace test |
| 305 } // namespace ash | 305 } // namespace ash |
| OLD | NEW |