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

Side by Side Diff: content/browser/renderer_host/test_render_view_host.h

Issue 11475017: Revert 171569 as it broke some browser_tests on win_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | Annotate | Revision Log
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 #endif 160 #endif
161 #if defined(OS_POSIX) || defined(USE_AURA) 161 #if defined(OS_POSIX) || defined(USE_AURA)
162 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} 162 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {}
163 #endif 163 #endif
164 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 164 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
165 virtual void SetHasHorizontalScrollbar( 165 virtual void SetHasHorizontalScrollbar(
166 bool has_horizontal_scrollbar) OVERRIDE { } 166 bool has_horizontal_scrollbar) OVERRIDE { }
167 virtual void SetScrollOffsetPinning( 167 virtual void SetScrollOffsetPinning(
168 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } 168 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { }
169 169
170 #if defined(USE_AURA)
171 virtual void AcceleratedSurfaceNew(
172 int32 width, int32 height, uint64 surface_id) OVERRIDE { }
173 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { }
174 #endif
175
170 #if defined(TOOLKIT_GTK) 176 #if defined(TOOLKIT_GTK)
171 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } 177 virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { }
172 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } 178 virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { }
173 #endif // defined(TOOLKIT_GTK) 179 #endif // defined(TOOLKIT_GTK)
174 180
175 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 181 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
176 182
177 virtual bool LockMouse() OVERRIDE; 183 virtual bool LockMouse() OVERRIDE;
178 virtual void UnlockMouse() OVERRIDE; 184 virtual void UnlockMouse() OVERRIDE;
179 185
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 TestRenderViewHost* active_test_rvh(); 348 TestRenderViewHost* active_test_rvh();
343 TestWebContents* contents(); 349 TestWebContents* contents();
344 350
345 private: 351 private:
346 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 352 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
347 }; 353 };
348 354
349 } // namespace content 355 } // namespace content
350 356
351 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ 357 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/common/gpu/client/gl_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698