| 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 int32 width, | 135 int32 width, |
| 136 int32 height, | 136 int32 height, |
| 137 uint64 surface_id) OVERRIDE; | 137 uint64 surface_id) OVERRIDE; |
| 138 virtual void AcceleratedSurfaceSetTransportDIB( | 138 virtual void AcceleratedSurfaceSetTransportDIB( |
| 139 gfx::PluginWindowHandle window, | 139 gfx::PluginWindowHandle window, |
| 140 int32 width, | 140 int32 width, |
| 141 int32 height, | 141 int32 height, |
| 142 TransportDIB::Handle transport_dib) OVERRIDE; | 142 TransportDIB::Handle transport_dib) OVERRIDE; |
| 143 #elif defined(OS_ANDROID) | 143 #elif defined(OS_ANDROID) |
| 144 virtual void StartContentIntent(const GURL&) OVERRIDE; | 144 virtual void StartContentIntent(const GURL&) OVERRIDE; |
| 145 virtual void DidSetNeedTouchEvents(bool need_touch_events) OVERRIDE {} |
| 145 #elif defined(OS_WIN) && !defined(USE_AURA) | 146 #elif defined(OS_WIN) && !defined(USE_AURA) |
| 146 virtual void WillWmDestroy() OVERRIDE; | 147 virtual void WillWmDestroy() OVERRIDE; |
| 147 #endif | 148 #endif |
| 148 #if defined(OS_POSIX) || defined(USE_AURA) | 149 #if defined(OS_POSIX) || defined(USE_AURA) |
| 149 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} | 150 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} |
| 150 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; | 151 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; |
| 151 #endif | 152 #endif |
| 152 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 153 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 153 bool processed) OVERRIDE { } | 154 bool processed) OVERRIDE { } |
| 154 virtual void SetHasHorizontalScrollbar( | 155 virtual void SetHasHorizontalScrollbar( |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 TestRenderViewHost* active_test_rvh(); | 341 TestRenderViewHost* active_test_rvh(); |
| 341 TestWebContents* contents(); | 342 TestWebContents* contents(); |
| 342 | 343 |
| 343 private: | 344 private: |
| 344 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 345 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
| 345 }; | 346 }; |
| 346 | 347 |
| 347 } // namespace content | 348 } // namespace content |
| 348 | 349 |
| 349 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 350 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| OLD | NEW |