OLD | NEW |
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 "chrome/browser/chromeos/input_method/textinput_test_helper.h" | 5 #include "chrome/browser/chromeos/input_method/textinput_test_helper.h" |
6 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
7 #include "chrome/browser/ui/browser_window.h" | 7 #include "chrome/browser/ui/browser_window.h" |
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
9 #include "chrome/test/base/in_process_browser_test.h" | 9 #include "chrome/test/base/in_process_browser_test.h" |
10 #include "chrome/test/base/interactive_test_utils.h" | 10 #include "chrome/test/base/interactive_test_utils.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 | 223 |
224 // Then re-enabling content editable, then expecting CONTENT_EDITABLE. | 224 // Then re-enabling content editable, then expecting CONTENT_EDITABLE. |
225 ASSERT_TRUE(content::ExecuteScript( | 225 ASSERT_TRUE(content::ExecuteScript( |
226 tab, | 226 tab, |
227 "document.getElementById('anchor_id').contentEditable = true;")); | 227 "document.getElementById('anchor_id').contentEditable = true;")); |
228 helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE); | 228 helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE); |
229 EXPECT_EQ(ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE, helper.GetTextInputType()); | 229 EXPECT_EQ(ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE, helper.GetTextInputType()); |
230 } | 230 } |
231 | 231 |
232 IN_PROC_BROWSER_TEST_F(TextInput_TextInputStateChangedTest, | 232 IN_PROC_BROWSER_TEST_F(TextInput_TextInputStateChangedTest, |
233 SwitchingAllTextInputTest) { | 233 DISABLED_SwitchingAllTextInputTest) { |
234 TextInputTestHelper helper; | 234 TextInputTestHelper helper; |
235 EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, helper.GetTextInputType()); | 235 EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, helper.GetTextInputType()); |
236 | 236 |
237 GURL url = ui_test_utils::GetTestUrl( | 237 GURL url = ui_test_utils::GetTestUrl( |
238 base::FilePath(FILE_PATH_LITERAL("textinput")), | 238 base::FilePath(FILE_PATH_LITERAL("textinput")), |
239 base::FilePath(FILE_PATH_LITERAL("all_input_node.html"))); | 239 base::FilePath(FILE_PATH_LITERAL("all_input_node.html"))); |
240 ui_test_utils::NavigateToURL(browser(), url); | 240 ui_test_utils::NavigateToURL(browser(), url); |
241 content::WebContents* tab = | 241 content::WebContents* tab = |
242 browser()->tab_strip_model()->GetActiveWebContents(); | 242 browser()->tab_strip_model()->GetActiveWebContents(); |
243 | 243 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 0); | 296 0); |
297 content::WebContents* new_tab = | 297 content::WebContents* new_tab = |
298 browser()->tab_strip_model()->GetActiveWebContents(); | 298 browser()->tab_strip_model()->GetActiveWebContents(); |
299 EXPECT_NE(base_tab, new_tab); | 299 EXPECT_NE(base_tab, new_tab); |
300 | 300 |
301 helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT); | 301 helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT); |
302 EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, helper.GetTextInputType()); | 302 EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, helper.GetTextInputType()); |
303 } | 303 } |
304 | 304 |
305 } // namespace chromeos | 305 } // namespace chromeos |
OLD | NEW |