| 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 "base/strings/stringprintf.h" | 5 #include "base/strings/stringprintf.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 content::RunAllPendingInMessageLoop(); | 734 content::RunAllPendingInMessageLoop(); |
| 735 | 735 |
| 736 ExtensionTestMessageListener copy_listener("copy", false); | 736 ExtensionTestMessageListener copy_listener("copy", false); |
| 737 SendCopyKeyPressToPlatformApp(); | 737 SendCopyKeyPressToPlatformApp(); |
| 738 | 738 |
| 739 // Wait for the guest to receive a 'copy' edit command. | 739 // Wait for the guest to receive a 'copy' edit command. |
| 740 ASSERT_TRUE(copy_listener.WaitUntilSatisfied()); | 740 ASSERT_TRUE(copy_listener.WaitUntilSatisfied()); |
| 741 } | 741 } |
| 742 | 742 |
| 743 // Tests that guests receive edit commands and respond appropriately. | 743 // Tests that guests receive edit commands and respond appropriately. |
| 744 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommandsNoMenu) { | 744 // http://crbug.com/417892 |
| 745 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_EditCommandsNoMenu) { |
| 745 SetupTest("web_view/edit_commands_no_menu", | 746 SetupTest("web_view/edit_commands_no_menu", |
| 746 "/extensions/platform_apps/web_view/edit_commands_no_menu/" | 747 "/extensions/platform_apps/web_view/edit_commands_no_menu/" |
| 747 "guest.html"); | 748 "guest.html"); |
| 748 | 749 |
| 749 ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow( | 750 ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow( |
| 750 GetPlatformAppWindow())); | 751 GetPlatformAppWindow())); |
| 751 | 752 |
| 752 // Flush any pending events to make sure we start with a clean slate. | 753 // Flush any pending events to make sure we start with a clean slate. |
| 753 content::RunAllPendingInMessageLoop(); | 754 content::RunAllPendingInMessageLoop(); |
| 754 | 755 |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 | 1161 |
| 1161 // Now verify that the selection text propagates properly to RWHV. | 1162 // Now verify that the selection text propagates properly to RWHV. |
| 1162 content::RenderWidgetHostView* guest_rwhv = | 1163 content::RenderWidgetHostView* guest_rwhv = |
| 1163 guest_web_contents()->GetRenderWidgetHostView(); | 1164 guest_web_contents()->GetRenderWidgetHostView(); |
| 1164 ASSERT_TRUE(guest_rwhv); | 1165 ASSERT_TRUE(guest_rwhv); |
| 1165 std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText()); | 1166 std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText()); |
| 1166 ASSERT_TRUE(selected_text.size() >= 10u); | 1167 ASSERT_TRUE(selected_text.size() >= 10u); |
| 1167 ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10)); | 1168 ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10)); |
| 1168 } | 1169 } |
| 1169 #endif | 1170 #endif |
| OLD | NEW |