From ccf6a766fbeb9440e7d224e5ab8c96481f733918 Mon Sep 17 00:00:00 2001
From: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Date: Fri, 10 Jan 2014 15:12:58 +0100
Subject: [PATCH] Fix overrides for Windows
Add not yet implemented overrides to render_widget_host_view_qt.h.
Remove ambiguous and unneeded override from browser_context_qt.h.
Change-Id: Id1cac9bf811d8e128e5ba8df059f7ca3bdd919dc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
src/core/browser_context_qt.h | 2 +-
src/core/render_widget_host_view_qt.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h
index 382b08ff3..dcd494b18 100644
--- a/src/core/browser_context_qt.h
+++ b/src/core/browser_context_qt.h
@@ -77,7 +77,7 @@ public:
downloadManagerDelegate.reset(new DownloadManagerDelegateQt);
}
- virtual ~BrowserContextQt() Q_DECL_OVERRIDE
+ virtual ~BrowserContextQt()
{
if (resourceContext)
content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, resourceContext.release());
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index fc037dfb1..6938b7060 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -199,6 +199,11 @@ public:
virtual void HasTouchEventHandlers(bool) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
#endif // defined(OS_ANDROID)
+#if defined(OS_WIN)
+ virtual void SetClickthroughRegion(SkRegion *) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ virtual void WillWmDestroy(void) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+#endif // defined(OS_WIN)
+
private:
void sendDelegatedFrameAck();
void Paint(const gfx::Rect& damage_rect);
--
GitLab