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

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

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 | 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_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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 virtual void AcceleratedSurfaceRelease() OVERRIDE {} 146 virtual void AcceleratedSurfaceRelease() OVERRIDE {}
147 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 147 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
148 #if defined(OS_MACOSX) 148 #if defined(OS_MACOSX)
149 virtual bool PostProcessEventForPluginIme( 149 virtual bool PostProcessEventForPluginIme(
150 const NativeWebKeyboardEvent& event) OVERRIDE; 150 const NativeWebKeyboardEvent& event) OVERRIDE;
151 #elif defined(OS_ANDROID) 151 #elif defined(OS_ANDROID)
152 virtual void ShowDisambiguationPopup( 152 virtual void ShowDisambiguationPopup(
153 const gfx::Rect& target_rect, 153 const gfx::Rect& target_rect,
154 const SkBitmap& zoomed_bitmap) OVERRIDE {} 154 const SkBitmap& zoomed_bitmap) OVERRIDE {}
155 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE {} 155 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE {}
156 #elif defined(OS_WIN) && !defined(USE_AURA)
157 virtual void WillWmDestroy() OVERRIDE;
158 #endif 156 #endif
159 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {} 157 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {}
160 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 158 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
161 virtual void SetHasHorizontalScrollbar( 159 virtual void SetHasHorizontalScrollbar(
162 bool has_horizontal_scrollbar) OVERRIDE { } 160 bool has_horizontal_scrollbar) OVERRIDE { }
163 virtual void SetScrollOffsetPinning( 161 virtual void SetScrollOffsetPinning(
164 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } 162 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { }
165 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 163 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
166 #if defined(OS_WIN) && !defined(USE_AURA)
167 virtual void SetClickthroughRegion(SkRegion* region) OVERRIDE;
168 #endif
169 virtual bool LockMouse() OVERRIDE; 164 virtual bool LockMouse() OVERRIDE;
170 virtual void UnlockMouse() OVERRIDE; 165 virtual void UnlockMouse() OVERRIDE;
171 #if defined(OS_WIN) && defined(USE_AURA) 166 #if defined(OS_WIN) && defined(USE_AURA)
172 virtual void SetParentNativeViewAccessible( 167 virtual void SetParentNativeViewAccessible(
173 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 168 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
174 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 169 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
175 #endif 170 #endif
176 171
177 bool is_showing() const { return is_showing_; } 172 bool is_showing() const { return is_showing_; }
178 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; } 173 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; }
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 private: 383 private:
389 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 384 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
390 ScopedSetSupportedScaleFactors; 385 ScopedSetSupportedScaleFactors;
391 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 386 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
392 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 387 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
393 }; 388 };
394 389
395 } // namespace content 390 } // namespace content
396 391
397 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 392 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698