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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/win/metro.h" | 8 #include "base/win/metro.h" |
9 #include "content/browser/renderer_host/render_widget_host_view_win.h" | 9 #include "content/browser/renderer_host/render_widget_host_view_win.h" |
10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 } // namespace | 81 } // namespace |
82 | 82 |
83 IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinBrowserTest, | 83 IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinBrowserTest, |
84 TextInputTypeChanged) { | 84 TextInputTypeChanged) { |
85 ASSERT_TRUE(view_->m_hWnd); | 85 ASSERT_TRUE(view_->m_hWnd); |
86 | 86 |
87 MockIMM32Manager* mock = new MockIMM32Manager(); | 87 MockIMM32Manager* mock = new MockIMM32Manager(); |
88 mock->Reset(); | 88 mock->Reset(); |
89 view_->imm32_manager_.reset(mock); | 89 view_->imm32_manager_.reset(mock); |
90 view_->TextInputTypeChanged(ui::TEXT_INPUT_TYPE_NONE, false, | 90 view_->TextInputTypeChanged(ui::TEXT_INPUT_TYPE_NONE, |
91 ui::TEXT_INPUT_MODE_EMAIL); | 91 ui::TEXT_INPUT_MODE_EMAIL, false); |
92 | 92 |
93 EXPECT_EQ(1, mock->call_count()); | 93 EXPECT_EQ(1, mock->call_count()); |
94 EXPECT_EQ(view_->m_hWnd, mock->window_handle()); | 94 EXPECT_EQ(view_->m_hWnd, mock->window_handle()); |
95 EXPECT_EQ(ui::TEXT_INPUT_MODE_EMAIL, mock->input_mode()); | 95 EXPECT_EQ(ui::TEXT_INPUT_MODE_EMAIL, mock->input_mode()); |
96 | 96 |
97 mock->Reset(); | 97 mock->Reset(); |
98 view_->TextInputTypeChanged(ui::TEXT_INPUT_TYPE_NONE, false, | 98 view_->TextInputTypeChanged(ui::TEXT_INPUT_TYPE_NONE, |
99 ui::TEXT_INPUT_MODE_EMAIL); | 99 ui::TEXT_INPUT_MODE_EMAIL, false); |
100 EXPECT_EQ(0, mock->call_count()); | 100 EXPECT_EQ(0, mock->call_count()); |
101 } | 101 } |
102 | 102 |
103 class RenderWidgetHostViewWinTSFTest : public ContentBrowserTest { | 103 class RenderWidgetHostViewWinTSFTest : public ContentBrowserTest { |
104 public: | 104 public: |
105 RenderWidgetHostViewWinTSFTest() {} | 105 RenderWidgetHostViewWinTSFTest() {} |
106 | 106 |
107 virtual void SetUpCommandLine(CommandLine* command_line) { | 107 virtual void SetUpCommandLine(CommandLine* command_line) { |
108 command_line->AppendSwitch(switches::kEnableTextServicesFramework); | 108 command_line->AppendSwitch(switches::kEnableTextServicesFramework); |
109 } | 109 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 &success)); | 217 &success)); |
218 EXPECT_TRUE(success); | 218 EXPECT_TRUE(success); |
219 WaitForLoadStop(shell()->web_contents()); | 219 WaitForLoadStop(shell()->web_contents()); |
220 RunAllPendingInMessageLoop(); | 220 RunAllPendingInMessageLoop(); |
221 EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, mock_bridge.latest_text_iput_type()); | 221 EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, mock_bridge.latest_text_iput_type()); |
222 | 222 |
223 ui::TSFBridge::ReplaceForTesting(old_bridge); | 223 ui::TSFBridge::ReplaceForTesting(old_bridge); |
224 } | 224 } |
225 | 225 |
226 } // namespace content | 226 } // namespace content |
OLD | NEW |