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 "content/browser/web_contents/touch_editable_impl_aura.h" | 5 #include "content/browser/web_contents/touch_editable_impl_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 | 182 |
183 // Starts the test server and navigates to the given url. Sets a large enough | 183 // Starts the test server and navigates to the given url. Sets a large enough |
184 // size to the root window. Returns after the navigation to the url is | 184 // size to the root window. Returns after the navigation to the url is |
185 // complete. | 185 // complete. |
186 void StartTestWithPage(const std::string& url) { | 186 void StartTestWithPage(const std::string& url) { |
187 ASSERT_TRUE(test_server()->Start()); | 187 ASSERT_TRUE(test_server()->Start()); |
188 GURL test_url(test_server()->GetURL(url)); | 188 GURL test_url(test_server()->GetURL(url)); |
189 NavigateToURL(shell(), test_url); | 189 NavigateToURL(shell(), test_url); |
190 aura::Window* content = | 190 aura::Window* content = |
191 shell()->web_contents()->GetView()->GetContentNativeView(); | 191 shell()->web_contents()->GetView()->GetContentNativeView(); |
192 content->GetRootWindow()->SetHostSize(gfx::Size(800, 600)); | 192 content->GetDispatcher()->SetHostSize(gfx::Size(800, 600)); |
193 } | 193 } |
194 | 194 |
195 // TODO(mohsen): Remove logs if the test showed no flakiness anymore. | 195 // TODO(mohsen): Remove logs if the test showed no flakiness anymore. |
196 void TestTouchSelectionOriginatingFromWebpage() { | 196 void TestTouchSelectionOriginatingFromWebpage() { |
197 ASSERT_NO_FATAL_FAILURE( | 197 ASSERT_NO_FATAL_FAILURE( |
198 StartTestWithPage("files/touch_selection.html")); | 198 StartTestWithPage("files/touch_selection.html")); |
199 WebContentsImpl* web_contents = | 199 WebContentsImpl* web_contents = |
200 static_cast<WebContentsImpl*>(shell()->web_contents()); | 200 static_cast<WebContentsImpl*>(shell()->web_contents()); |
201 RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>( | 201 RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>( |
202 web_contents->GetRenderViewHost()); | 202 web_contents->GetRenderViewHost()); |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 TouchSelectionOnLongPressTest) { | 452 TouchSelectionOnLongPressTest) { |
453 TestTouchSelectionOnLongPress(); | 453 TestTouchSelectionOnLongPress(); |
454 } | 454 } |
455 | 455 |
456 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, | 456 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
457 TouchCursorInTextfieldTest) { | 457 TouchCursorInTextfieldTest) { |
458 TestTouchCursorInTextfield(); | 458 TestTouchCursorInTextfield(); |
459 } | 459 } |
460 | 460 |
461 } // namespace content | 461 } // namespace content |
OLD | NEW |