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/display/display_manager.h" | 5 #include "ash/display/display_manager.h" |
6 #include "ash/root_window_controller.h" | 6 #include "ash/root_window_controller.h" |
7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 47 |
48 DISALLOW_COPY_AND_ASSIGN(LoginTestWidgetDelegate); | 48 DISALLOW_COPY_AND_ASSIGN(LoginTestWidgetDelegate); |
49 }; | 49 }; |
50 | 50 |
51 } // namespace | 51 } // namespace |
52 | 52 |
53 class LockLayoutManagerTest : public AshTestBase { | 53 class LockLayoutManagerTest : public AshTestBase { |
54 public: | 54 public: |
55 void SetUp() override { | 55 void SetUp() override { |
56 // Allow a virtual keyboard (and initialize it per default). | 56 // Allow a virtual keyboard (and initialize it per default). |
57 CommandLine::ForCurrentProcess()->AppendSwitch( | 57 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
58 keyboard::switches::kEnableVirtualKeyboard); | 58 keyboard::switches::kEnableVirtualKeyboard); |
59 AshTestBase::SetUp(); | 59 AshTestBase::SetUp(); |
60 Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 60 Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
61 keyboard::KeyboardController::GetInstance()); | 61 keyboard::KeyboardController::GetInstance()); |
62 } | 62 } |
63 | 63 |
64 void TearDown() override { | 64 void TearDown() override { |
65 Shell::GetPrimaryRootWindowController()->DeactivateKeyboard( | 65 Shell::GetPrimaryRootWindowController()->DeactivateKeyboard( |
66 keyboard::KeyboardController::GetInstance()); | 66 keyboard::KeyboardController::GetInstance()); |
67 AshTestBase::TearDown(); | 67 AshTestBase::TearDown(); |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); | 283 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); |
284 window->SetBounds(work_area); | 284 window->SetBounds(work_area); |
285 // Usually work_area takes Shelf into account but that doesn't affect | 285 // Usually work_area takes Shelf into account but that doesn't affect |
286 // LockScreen container windows. | 286 // LockScreen container windows. |
287 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); | 287 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); |
288 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); | 288 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); |
289 } | 289 } |
290 | 290 |
291 } // namespace test | 291 } // namespace test |
292 } // namespace ash | 292 } // namespace ash |
OLD | NEW |