| 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/public/test/layouttest_support.h" | 5 #include "content/public/test/layouttest_support.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_impl.h" | 9 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 10 #include "content/common/gpu/image_transport_surface.h" | 10 #include "content/common/gpu/image_transport_surface.h" |
| 11 #include "content/renderer/render_thread_impl.h" | 11 #include "content/renderer/render_thread_impl.h" |
| 12 #include "content/renderer/render_view_impl.h" | 12 #include "content/renderer/render_view_impl.h" |
| 13 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 13 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 14 #include "content/test/test_media_stream_client.h" | 14 #include "content/test/test_media_stream_client.h" |
| 15 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h" | 15 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h" |
| 16 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h" | 16 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h" |
| 17 #include "third_party/WebKit/public/platform/WebGamepads.h" | 17 #include "third_party/WebKit/public/platform/WebGamepads.h" |
| 18 #include "third_party/WebKit/public/testing/WebFrameTestProxy.h" | 18 #include "third_party/WebKit/public/testing/WebFrameTestProxy.h" |
| 19 #include "third_party/WebKit/public/testing/WebTestProxy.h" | 19 #include "third_party/WebKit/public/testing/WebTestProxy.h" |
| 20 | 20 |
| 21 #if defined(OS_WIN) && !defined(USE_AURA) | 21 #if defined(OS_WIN) && !defined(USE_AURA) |
| 22 #include "content/browser/web_contents/web_contents_drag_win.h" | 22 #include "content/browser/web_contents/web_contents_drag_win.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
| 26 #include "content/browser/renderer_host/popup_menu_helper_mac.h" | 26 #include "content/browser/renderer_host/popup_menu_helper_mac.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 using WebKit::WebDeviceMotionData; | 29 using blink::WebDeviceMotionData; |
| 30 using WebKit::WebDeviceOrientationData; | 30 using blink::WebDeviceOrientationData; |
| 31 using WebKit::WebGamepads; | 31 using blink::WebGamepads; |
| 32 using WebKit::WebRect; | 32 using blink::WebRect; |
| 33 using WebKit::WebSize; | 33 using blink::WebSize; |
| 34 using WebTestRunner::WebFrameTestProxy; | 34 using WebTestRunner::WebFrameTestProxy; |
| 35 using WebTestRunner::WebTestProxy; | 35 using WebTestRunner::WebTestProxy; |
| 36 using WebTestRunner::WebTestProxyBase; | 36 using WebTestRunner::WebTestProxyBase; |
| 37 | 37 |
| 38 namespace content { | 38 namespace content { |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 base::LazyInstance<base::Callback<void(RenderView*, WebTestProxyBase*)> >::Leaky | 42 base::LazyInstance<base::Callback<void(RenderView*, WebTestProxyBase*)> >::Leaky |
| 43 g_callback = LAZY_INSTANCE_INITIALIZER; | 43 g_callback = LAZY_INSTANCE_INITIALIZER; |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 DisableAutoResizeForTesting(new_size); | 152 DisableAutoResizeForTesting(new_size); |
| 153 } | 153 } |
| 154 | 154 |
| 155 void UseMockMediaStreams(RenderView* render_view) { | 155 void UseMockMediaStreams(RenderView* render_view) { |
| 156 RenderViewImpl* render_view_impl = static_cast<RenderViewImpl*>(render_view); | 156 RenderViewImpl* render_view_impl = static_cast<RenderViewImpl*>(render_view); |
| 157 render_view_impl->SetMediaStreamClientForTesting( | 157 render_view_impl->SetMediaStreamClientForTesting( |
| 158 new TestMediaStreamClient(render_view_impl)); | 158 new TestMediaStreamClient(render_view_impl)); |
| 159 } | 159 } |
| 160 | 160 |
| 161 } // namespace content | 161 } // namespace content |
| OLD | NEW |