Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Side by Side Diff: ash/display/virtual_keyboard_window_controller_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/display/virtual_keyboard_window_controller.cc ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/display/virtual_keyboard_window_controller.h" 5 #include "ash/display/virtual_keyboard_window_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/display/display_controller.h" 8 #include "ash/display/display_controller.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "ui/keyboard/keyboard_switches.h" 14 #include "ui/keyboard/keyboard_switches.h"
15 #include "ui/keyboard/keyboard_util.h" 15 #include "ui/keyboard/keyboard_util.h"
16 16
17 namespace ash { 17 namespace ash {
18 namespace test { 18 namespace test {
19 19
20 class VirtualKeyboardWindowControllerTest : public AshTestBase { 20 class VirtualKeyboardWindowControllerTest : public AshTestBase {
21 public: 21 public:
22 VirtualKeyboardWindowControllerTest() 22 VirtualKeyboardWindowControllerTest()
23 : virtual_keyboard_window_controller_(NULL) {} 23 : virtual_keyboard_window_controller_(NULL) {}
24 virtual ~VirtualKeyboardWindowControllerTest() {} 24 virtual ~VirtualKeyboardWindowControllerTest() {}
25 25
26 void set_virtual_keyboard_window_controller( 26 void set_virtual_keyboard_window_controller(
27 internal::VirtualKeyboardWindowController* controller) { 27 VirtualKeyboardWindowController* controller) {
28 virtual_keyboard_window_controller_ = controller; 28 virtual_keyboard_window_controller_ = controller;
29 } 29 }
30 30
31 internal::RootWindowController* root_window_controller() { 31 RootWindowController* root_window_controller() {
32 return virtual_keyboard_window_controller_-> 32 return virtual_keyboard_window_controller_->
33 root_window_controller_for_test(); 33 root_window_controller_for_test();
34 } 34 }
35 35
36 private: 36 private:
37 internal::VirtualKeyboardWindowController* 37 VirtualKeyboardWindowController* virtual_keyboard_window_controller_;
38 virtual_keyboard_window_controller_;
39 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowControllerTest); 38 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowControllerTest);
40 }; 39 };
41 40
42 class VirtualKeyboardUsabilityExperimentTest 41 class VirtualKeyboardUsabilityExperimentTest
43 : public VirtualKeyboardWindowControllerTest { 42 : public VirtualKeyboardWindowControllerTest {
44 public: 43 public:
45 VirtualKeyboardUsabilityExperimentTest() 44 VirtualKeyboardUsabilityExperimentTest()
46 : VirtualKeyboardWindowControllerTest() {} 45 : VirtualKeyboardWindowControllerTest() {}
47 virtual ~VirtualKeyboardUsabilityExperimentTest() {} 46 virtual ~VirtualKeyboardUsabilityExperimentTest() {}
48 47
(...skipping 14 matching lines...) Expand all
63 TEST_F(VirtualKeyboardUsabilityExperimentTest, VirtualKeyboardWindowTest) { 62 TEST_F(VirtualKeyboardUsabilityExperimentTest, VirtualKeyboardWindowTest) {
64 if (!SupportsMultipleDisplays()) 63 if (!SupportsMultipleDisplays())
65 return; 64 return;
66 RunAllPendingInMessageLoop(); 65 RunAllPendingInMessageLoop();
67 set_virtual_keyboard_window_controller( 66 set_virtual_keyboard_window_controller(
68 Shell::GetInstance()->display_controller()-> 67 Shell::GetInstance()->display_controller()->
69 virtual_keyboard_window_controller()); 68 virtual_keyboard_window_controller());
70 EXPECT_TRUE(root_window_controller()); 69 EXPECT_TRUE(root_window_controller());
71 // Keyboard container is added to virtual keyboard window. 70 // Keyboard container is added to virtual keyboard window.
72 EXPECT_TRUE(root_window_controller()->GetContainer( 71 EXPECT_TRUE(root_window_controller()->GetContainer(
73 internal::kShellWindowId_VirtualKeyboardContainer)); 72 kShellWindowId_VirtualKeyboardContainer));
74 } 73 }
75 74
76 // Tests that the onscreen keyboard becomes enabled when maximize mode is 75 // Tests that the onscreen keyboard becomes enabled when maximize mode is
77 // enabled. 76 // enabled.
78 TEST_F(VirtualKeyboardWindowControllerTest, EnabledDuringMaximizeMode) { 77 TEST_F(VirtualKeyboardWindowControllerTest, EnabledDuringMaximizeMode) {
79 set_virtual_keyboard_window_controller( 78 set_virtual_keyboard_window_controller(
80 Shell::GetInstance()->display_controller()-> 79 Shell::GetInstance()->display_controller()->
81 virtual_keyboard_window_controller()); 80 virtual_keyboard_window_controller());
82 81
83 ASSERT_FALSE(keyboard::IsKeyboardEnabled()); 82 ASSERT_FALSE(keyboard::IsKeyboardEnabled());
84 Shell::GetInstance()->EnableMaximizeModeWindowManager(true); 83 Shell::GetInstance()->EnableMaximizeModeWindowManager(true);
85 EXPECT_TRUE(keyboard::IsKeyboardEnabled()); 84 EXPECT_TRUE(keyboard::IsKeyboardEnabled());
86 Shell::GetInstance()->EnableMaximizeModeWindowManager(false); 85 Shell::GetInstance()->EnableMaximizeModeWindowManager(false);
87 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); 86 EXPECT_FALSE(keyboard::IsKeyboardEnabled());
88 } 87 }
89 88
90 } // namespace test 89 } // namespace test
91 } // namespace ash 90 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/virtual_keyboard_window_controller.cc ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698