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

Side by Side Diff: content/test/test_render_view_host.h

Issue 610893003: Remove #ifdefs around ShowLinkDisambiguationPopup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix my awful spelling Created 6 years, 2 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/shell/browser/shell_web_contents_view_delegate_win.cc ('k') | no next file » | 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) 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_TEST_TEST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 virtual void AcceleratedSurfacePostSubBuffer( 131 virtual void AcceleratedSurfacePostSubBuffer(
132 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 132 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
133 int gpu_host_id) OVERRIDE; 133 int gpu_host_id) OVERRIDE;
134 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 134 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
135 virtual void AcceleratedSurfaceRelease() OVERRIDE {} 135 virtual void AcceleratedSurfaceRelease() OVERRIDE {}
136 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 136 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
137 #if defined(OS_MACOSX) 137 #if defined(OS_MACOSX)
138 virtual bool PostProcessEventForPluginIme( 138 virtual bool PostProcessEventForPluginIme(
139 const NativeWebKeyboardEvent& event) OVERRIDE; 139 const NativeWebKeyboardEvent& event) OVERRIDE;
140 #endif 140 #endif
141 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
142 virtual void ShowDisambiguationPopup(
143 const gfx::Rect& rect_pixels,
144 const SkBitmap& zoomed_bitmap) OVERRIDE {}
145 #endif
146 #if defined(OS_ANDROID) 141 #if defined(OS_ANDROID)
147 virtual void LockCompositingSurface() OVERRIDE {} 142 virtual void LockCompositingSurface() OVERRIDE {}
148 virtual void UnlockCompositingSurface() OVERRIDE {} 143 virtual void UnlockCompositingSurface() OVERRIDE {}
149 #endif 144 #endif
150 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {} 145 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {}
151 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 146 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
152 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 147 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
153 virtual bool LockMouse() OVERRIDE; 148 virtual bool LockMouse() OVERRIDE;
154 virtual void UnlockMouse() OVERRIDE; 149 virtual void UnlockMouse() OVERRIDE;
155 #if defined(OS_WIN) 150 #if defined(OS_WIN)
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 private: 399 private:
405 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 400 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
406 ScopedSetSupportedScaleFactors; 401 ScopedSetSupportedScaleFactors;
407 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 402 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
408 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 403 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
409 }; 404 };
410 405
411 } // namespace content 406 } // namespace content
412 407
413 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 408 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_web_contents_view_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698