diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 18:02:08 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 18:02:08 +0000 |
| commit | 2ceee8f17b6fa286d37f0e9190fed01e5f6a9eff (patch) | |
| tree | 8d9e1abeb296d0339aa84f2f3eca170ebb53198f /content/test | |
| parent | 3ae13e0deb8744e78cb8827c44d1247b37a1cd6e (diff) | |
| download | chromium_src-2ceee8f17b6fa286d37f0e9190fed01e5f6a9eff.zip chromium_src-2ceee8f17b6fa286d37f0e9190fed01e5f6a9eff.tar.gz chromium_src-2ceee8f17b6fa286d37f0e9190fed01e5f6a9eff.tar.bz2 | |
Remove some code inside USE_AURA and OS_WIN ifdefs in content.
I also removed the _win.cc files inside content.
BUG=330735
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/137403005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
| -rw-r--r-- | content/test/layouttest_support.cc | 6 | ||||
| -rw-r--r-- | content/test/test_render_view_host.cc | 8 | ||||
| -rw-r--r-- | content/test/test_render_view_host.h | 5 |
3 files changed, 0 insertions, 19 deletions
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc index 125d2a2..9f175e0 100644 --- a/content/test/layouttest_support.cc +++ b/content/test/layouttest_support.cc @@ -18,10 +18,6 @@ #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h" #include "third_party/WebKit/public/platform/WebGamepads.h" -#if defined(OS_WIN) && !defined(USE_AURA) -#include "content/browser/web_contents/web_contents_drag_win.h" -#endif - #if defined(OS_MACOSX) #include "content/browser/renderer_host/popup_menu_helper_mac.h" #endif @@ -103,8 +99,6 @@ void EnableBrowserLayoutTestMode() { #if defined(OS_MACOSX) ImageTransportSurface::SetAllowOSMesaForTesting(true); PopupMenuHelper::DontShowPopupMenuForTesting(); -#elif defined(OS_WIN) && !defined(USE_AURA) - WebContentsDragWin::DisableDragDropForTesting(); #endif RenderWidgetHostImpl::DisableResizeAckCheckForTesting(); } diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc index 0754316..9b79ca6 100644 --- a/content/test/test_render_view_host.cc +++ b/content/test/test_render_view_host.cc @@ -179,9 +179,6 @@ bool TestRenderWidgetHostView::PostProcessEventForPluginIme( return false; } -#elif defined(OS_WIN) && !defined(USE_AURA) -void TestRenderWidgetHostView::WillWmDestroy() { -} #endif gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() { @@ -209,11 +206,6 @@ gfx::GLSurfaceHandle TestRenderWidgetHostView::GetCompositingSurface() { return gfx::GLSurfaceHandle(); } -#if defined(OS_WIN) && !defined(USE_AURA) -void TestRenderWidgetHostView::SetClickthroughRegion(SkRegion* region) { -} -#endif - bool TestRenderWidgetHostView::LockMouse() { return false; } diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h index fa524b5..308049f 100644 --- a/content/test/test_render_view_host.h +++ b/content/test/test_render_view_host.h @@ -153,8 +153,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) OVERRIDE {} virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE {} -#elif defined(OS_WIN) && !defined(USE_AURA) - virtual void WillWmDestroy() OVERRIDE; #endif virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {} virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; @@ -163,9 +161,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { virtual void SetScrollOffsetPinning( bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { } virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; -#if defined(OS_WIN) && !defined(USE_AURA) - virtual void SetClickthroughRegion(SkRegion* region) OVERRIDE; -#endif virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; #if defined(OS_WIN) && defined(USE_AURA) |