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

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

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 #include "content/test/test_render_view_host.h" 5 #include "content/test/test_render_view_host.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 173
174 void TestRenderWidgetHostView::StopSpeaking() { 174 void TestRenderWidgetHostView::StopSpeaking() {
175 } 175 }
176 176
177 bool TestRenderWidgetHostView::PostProcessEventForPluginIme( 177 bool TestRenderWidgetHostView::PostProcessEventForPluginIme(
178 const NativeWebKeyboardEvent& event) { 178 const NativeWebKeyboardEvent& event) {
179 return false; 179 return false;
180 } 180 }
181 181
182 #elif defined(OS_WIN) && !defined(USE_AURA)
183 void TestRenderWidgetHostView::WillWmDestroy() {
184 }
185 #endif 182 #endif
186 183
187 gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() { 184 gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() {
188 return gfx::Rect(); 185 return gfx::Rect();
189 } 186 }
190 187
191 #if defined(TOOLKIT_GTK) 188 #if defined(TOOLKIT_GTK)
192 GdkEventButton* TestRenderWidgetHostView::GetLastMouseDown() { 189 GdkEventButton* TestRenderWidgetHostView::GetLastMouseDown() {
193 return NULL; 190 return NULL;
194 } 191 }
195 192
196 gfx::NativeView TestRenderWidgetHostView::BuildInputMethodsGtkMenu() { 193 gfx::NativeView TestRenderWidgetHostView::BuildInputMethodsGtkMenu() {
197 return NULL; 194 return NULL;
198 } 195 }
199 #endif // defined(TOOLKIT_GTK) 196 #endif // defined(TOOLKIT_GTK)
200 197
201 void TestRenderWidgetHostView::OnSwapCompositorFrame( 198 void TestRenderWidgetHostView::OnSwapCompositorFrame(
202 uint32 output_surface_id, 199 uint32 output_surface_id,
203 scoped_ptr<cc::CompositorFrame> frame) { 200 scoped_ptr<cc::CompositorFrame> frame) {
204 did_swap_compositor_frame_ = true; 201 did_swap_compositor_frame_ = true;
205 } 202 }
206 203
207 204
208 gfx::GLSurfaceHandle TestRenderWidgetHostView::GetCompositingSurface() { 205 gfx::GLSurfaceHandle TestRenderWidgetHostView::GetCompositingSurface() {
209 return gfx::GLSurfaceHandle(); 206 return gfx::GLSurfaceHandle();
210 } 207 }
211 208
212 #if defined(OS_WIN) && !defined(USE_AURA)
213 void TestRenderWidgetHostView::SetClickthroughRegion(SkRegion* region) {
214 }
215 #endif
216
217 bool TestRenderWidgetHostView::LockMouse() { 209 bool TestRenderWidgetHostView::LockMouse() {
218 return false; 210 return false;
219 } 211 }
220 212
221 void TestRenderWidgetHostView::UnlockMouse() { 213 void TestRenderWidgetHostView::UnlockMouse() {
222 } 214 }
223 215
224 #if defined(OS_WIN) && defined(USE_AURA) 216 #if defined(OS_WIN) && defined(USE_AURA)
225 void TestRenderWidgetHostView::SetParentNativeViewAccessible( 217 void TestRenderWidgetHostView::SetParentNativeViewAccessible(
226 gfx::NativeViewAccessible accessible_parent) { 218 gfx::NativeViewAccessible accessible_parent) {
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 426
435 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { 427 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
436 return static_cast<TestRenderFrameHost*>(main_rfh()); 428 return static_cast<TestRenderFrameHost*>(main_rfh());
437 } 429 }
438 430
439 TestWebContents* RenderViewHostImplTestHarness::contents() { 431 TestWebContents* RenderViewHostImplTestHarness::contents() {
440 return static_cast<TestWebContents*>(web_contents()); 432 return static_cast<TestWebContents*>(web_contents());
441 } 433 }
442 434
443 } // namespace content 435 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698