Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Side by Side Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | ui/events/blink/input_handler_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/shell/renderer/layout_test/layout_test_content_renderer_client .h" 5 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "components/test_runner/mock_credential_manager_client.h" 10 #include "components/test_runner/mock_credential_manager_client.h"
11 #include "components/test_runner/web_frame_test_proxy.h" 11 #include "components/test_runner/web_frame_test_proxy.h"
12 #include "components/test_runner/web_test_interfaces.h" 12 #include "components/test_runner/web_test_interfaces.h"
13 #include "components/test_runner/web_test_proxy.h" 13 #include "components/test_runner/web_test_proxy.h"
14 #include "components/test_runner/web_test_runner.h" 14 #include "components/test_runner/web_test_runner.h"
15 #include "components/web_cache/renderer/web_cache_impl.h" 15 #include "components/web_cache/renderer/web_cache_impl.h"
16 #include "content/common/input/input_event_utils.h"
17 #include "content/public/common/content_constants.h" 16 #include "content/public/common/content_constants.h"
18 #include "content/public/common/content_switches.h" 17 #include "content/public/common/content_switches.h"
19 #include "content/public/renderer/render_frame.h" 18 #include "content/public/renderer/render_frame.h"
20 #include "content/public/renderer/render_view.h" 19 #include "content/public/renderer/render_view.h"
21 #include "content/public/test/layouttest_support.h" 20 #include "content/public/test/layouttest_support.h"
22 #include "content/shell/common/shell_switches.h" 21 #include "content/shell/common/shell_switches.h"
23 #include "content/shell/renderer/layout_test/blink_test_helpers.h" 22 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
24 #include "content/shell/renderer/layout_test/blink_test_runner.h" 23 #include "content/shell/renderer/layout_test/blink_test_runner.h"
25 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h " 24 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h "
26 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h" 25 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 RenderView* render_view) { 115 RenderView* render_view) {
117 new ShellRenderViewObserver(render_view); 116 new ShellRenderViewObserver(render_view);
118 117
119 test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view); 118 test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
120 proxy->set_web_view(render_view->GetWebView()); 119 proxy->set_web_view(render_view->GetWebView());
121 // TODO(lfg): We should fix the TestProxy to track the WebWidgets on every 120 // TODO(lfg): We should fix the TestProxy to track the WebWidgets on every
122 // local root in WebFrameTestProxy instead of having only the WebWidget for 121 // local root in WebFrameTestProxy instead of having only the WebWidget for
123 // the main frame in WebTestProxy. 122 // the main frame in WebTestProxy.
124 proxy->set_web_widget(render_view->GetWebView()->widget()); 123 proxy->set_web_widget(render_view->GetWebView()->widget());
125 proxy->Reset(); 124 proxy->Reset();
126 proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
127 125
128 BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view); 126 BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
129 test_runner->Reset(false /* for_new_test */); 127 test_runner->Reset(false /* for_new_test */);
130 128
131 LayoutTestRenderThreadObserver::GetInstance() 129 LayoutTestRenderThreadObserver::GetInstance()
132 ->test_interfaces() 130 ->test_interfaces()
133 ->TestRunner() 131 ->TestRunner()
134 ->InitializeWebViewWithMocks(render_view->GetWebView()); 132 ->InitializeWebViewWithMocks(render_view->GetWebView());
135 } 133 }
136 134
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 return nullptr; 201 return nullptr;
204 #endif 202 #endif
205 } 203 }
206 204
207 void LayoutTestContentRendererClient::DidInitializeWorkerContextOnWorkerThread( 205 void LayoutTestContentRendererClient::DidInitializeWorkerContextOnWorkerThread(
208 v8::Local<v8::Context> context) { 206 v8::Local<v8::Context> context) {
209 blink::WebTestingSupport::injectInternalsObject(context); 207 blink::WebTestingSupport::injectInternalsObject(context);
210 } 208 }
211 209
212 } // namespace content 210 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | ui/events/blink/input_handler_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698