OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include "ash/session/session_state_delegate.h" | 7 #include "ash/session/session_state_delegate.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
605 gfx::Point(size.width() - 1, size.height() - 1))); | 605 gfx::Point(size.width() - 1, size.height() - 1))); |
606 } | 606 } |
607 | 607 |
608 class VirtualKeyboardRootWindowControllerTest | 608 class VirtualKeyboardRootWindowControllerTest |
609 : public RootWindowControllerTest { | 609 : public RootWindowControllerTest { |
610 public: | 610 public: |
611 VirtualKeyboardRootWindowControllerTest() {} | 611 VirtualKeyboardRootWindowControllerTest() {} |
612 ~VirtualKeyboardRootWindowControllerTest() override {} | 612 ~VirtualKeyboardRootWindowControllerTest() override {} |
613 | 613 |
614 void SetUp() override { | 614 void SetUp() override { |
615 CommandLine::ForCurrentProcess()->AppendSwitch( | 615 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
616 keyboard::switches::kEnableVirtualKeyboard); | 616 keyboard::switches::kEnableVirtualKeyboard); |
617 test::AshTestBase::SetUp(); | 617 test::AshTestBase::SetUp(); |
618 Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 618 Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
619 keyboard::KeyboardController::GetInstance()); | 619 keyboard::KeyboardController::GetInstance()); |
620 } | 620 } |
621 | 621 |
622 private: | 622 private: |
623 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardRootWindowControllerTest); | 623 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardRootWindowControllerTest); |
624 }; | 624 }; |
625 | 625 |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
955 ASSERT_TRUE(keyboard_container); | 955 ASSERT_TRUE(keyboard_container); |
956 keyboard_container->Show(); | 956 keyboard_container->Show(); |
957 EXPECT_EQ("0,0 800x600", keyboard_container->bounds().ToString()); | 957 EXPECT_EQ("0,0 800x600", keyboard_container->bounds().ToString()); |
958 | 958 |
959 UpdateDisplay("600x800"); | 959 UpdateDisplay("600x800"); |
960 EXPECT_EQ("0,0 600x800", keyboard_container->bounds().ToString()); | 960 EXPECT_EQ("0,0 600x800", keyboard_container->bounds().ToString()); |
961 } | 961 } |
962 | 962 |
963 } // namespace test | 963 } // namespace test |
964 } // namespace ash | 964 } // namespace ash |
OLD | NEW |