| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 int32 width, | 146 int32 width, |
| 147 int32 height, | 147 int32 height, |
| 148 TransportDIB::Handle transport_dib) OVERRIDE; | 148 TransportDIB::Handle transport_dib) OVERRIDE; |
| 149 #elif defined(OS_WIN) && !defined(USE_AURA) | 149 #elif defined(OS_WIN) && !defined(USE_AURA) |
| 150 virtual void WillWmDestroy() OVERRIDE; | 150 virtual void WillWmDestroy() OVERRIDE; |
| 151 #endif | 151 #endif |
| 152 #if defined(OS_POSIX) || defined(USE_AURA) | 152 #if defined(OS_POSIX) || defined(USE_AURA) |
| 153 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} | 153 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} |
| 154 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 154 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
| 155 #endif | 155 #endif |
| 156 virtual void ProcessTouchAck(bool processed) OVERRIDE { } | 156 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 157 bool processed) OVERRIDE { } |
| 157 virtual void SetHasHorizontalScrollbar( | 158 virtual void SetHasHorizontalScrollbar( |
| 158 bool has_horizontal_scrollbar) OVERRIDE { } | 159 bool has_horizontal_scrollbar) OVERRIDE { } |
| 159 virtual void SetScrollOffsetPinning( | 160 virtual void SetScrollOffsetPinning( |
| 160 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } | 161 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } |
| 161 | 162 |
| 162 #if defined(USE_AURA) | 163 #if defined(USE_AURA) |
| 163 virtual void AcceleratedSurfaceNew( | 164 virtual void AcceleratedSurfaceNew( |
| 164 int32 width, int32 height, uint64* surface_id, | 165 int32 width, int32 height, uint64* surface_id, |
| 165 TransportDIB::Handle* surface_handle) OVERRIDE { } | 166 TransportDIB::Handle* surface_handle) OVERRIDE { } |
| 166 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { } | 167 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { } |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 private: | 375 private: |
| 375 scoped_ptr<TestTabContents> contents_; | 376 scoped_ptr<TestTabContents> contents_; |
| 376 #if defined(USE_AURA) | 377 #if defined(USE_AURA) |
| 377 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_; | 378 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_; |
| 378 #endif | 379 #endif |
| 379 | 380 |
| 380 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); | 381 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); |
| 381 }; | 382 }; |
| 382 | 383 |
| 383 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ | 384 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ |
| OLD | NEW |