| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 ui::DomCode::US_E, ui::VKEY_E, false, false, false, false); | 864 ui::DomCode::US_E, ui::VKEY_E, false, false, false, false); |
| 865 bounds_observer.Wait(); | 865 bounds_observer.Wait(); |
| 866 }; | 866 }; |
| 867 | 867 |
| 868 for (auto* view : views) | 868 for (auto* view : views) |
| 869 send_tab_insert_text_wait_for_bounds_change(view); | 869 send_tab_insert_text_wait_for_bounds_change(view); |
| 870 } | 870 } |
| 871 | 871 |
| 872 // This test makes sure browser correctly tracks focused editable element inside | 872 // This test makes sure browser correctly tracks focused editable element inside |
| 873 // each RenderFrameHost. | 873 // each RenderFrameHost. |
| 874 // Test is flaky on ChromeOS. crbug.com/705203 |
| 875 #if defined(OS_CHROMEOS) |
| 876 #define MAYBE_TrackingFocusedElementForAllFrames \ |
| 877 DISABLED_TrackingFocusedElementForAllFrames |
| 878 #else |
| 879 #define MAYBE_TrackingFocusedElementForAllFrames \ |
| 880 TrackingFocusedElementForAllFrames |
| 881 #endif |
| 874 IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, | 882 IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, |
| 875 TrackingFocusedElementForAllFrames) { | 883 MAYBE_TrackingFocusedElementForAllFrames) { |
| 876 CreateIframePage("a(a, b(a))"); | 884 CreateIframePage("a(a, b(a))"); |
| 877 std::vector<content::RenderFrameHost*> frames{ | 885 std::vector<content::RenderFrameHost*> frames{ |
| 878 GetFrame(IndexVector{}), GetFrame(IndexVector{0}), | 886 GetFrame(IndexVector{}), GetFrame(IndexVector{0}), |
| 879 GetFrame(IndexVector{1}), GetFrame(IndexVector{1, 0})}; | 887 GetFrame(IndexVector{1}), GetFrame(IndexVector{1, 0})}; |
| 880 for (size_t i = 0; i < frames.size(); ++i) | 888 for (size_t i = 0; i < frames.size(); ++i) |
| 881 AddInputFieldToFrame(frames[i], "text", "some text", true); | 889 AddInputFieldToFrame(frames[i], "text", "some text", true); |
| 882 | 890 |
| 883 // Focus the <input> in |frame| and return if RenderFrameHost thinks there is | 891 // Focus the <input> in |frame| and return if RenderFrameHost thinks there is |
| 884 // a focused editable element in it. | 892 // a focused editable element in it. |
| 885 auto focus_input_and_return_editable_element_state = | 893 auto focus_input_and_return_editable_element_state = |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1356 | 1364 |
| 1357 // Closing this WebContents while we still hold on to our TestBrowserClient. | 1365 // Closing this WebContents while we still hold on to our TestBrowserClient. |
| 1358 EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt( | 1366 EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt( |
| 1359 1, TabStripModel::CLOSE_USER_GESTURE)); | 1367 1, TabStripModel::CLOSE_USER_GESTURE)); |
| 1360 | 1368 |
| 1361 // For the cleanup of the original WebContents in tab index 0. | 1369 // For the cleanup of the original WebContents in tab index 0. |
| 1362 content::SetBrowserClientForTesting(old_browser_client); | 1370 content::SetBrowserClientForTesting(old_browser_client); |
| 1363 } | 1371 } |
| 1364 #endif // defined(MAC_OSX) | 1372 #endif // defined(MAC_OSX) |
| 1365 #endif // !defined(OS_ANDROID) | 1373 #endif // !defined(OS_ANDROID) |
| OLD | NEW |