diff options
author | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-07-12 10:38:14 +0200 |
---|---|---|
committer | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-07-14 14:04:43 +0000 |
commit | 90585f98d1dc57b97f95f4d8aec7f5d06dbe552b (patch) | |
tree | f4c5cb14310d47a74e3898487f35068f85a0962d /src/core | |
parent | cf553f616f61665a336256bc0f9ee2b5fceac00f (diff) |
Move toolTip handling to WebContentsAdapterClient
This is essential for set tooltip in Qt Quick part
because the setToolTip function should not be public.
Change-Id: I1ebd0c811504fded8edff1a5a6110ce3512bab4f
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h | 1 | ||||
-rw-r--r-- | src/core/web_contents_adapter_client.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 91e503e6f..326965416 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -607,7 +607,7 @@ void RenderWidgetHostViewQt::Destroy() void RenderWidgetHostViewQt::SetTooltipText(const base::string16 &tooltip_text) { - m_delegate->setTooltip(toQt(tooltip_text)); + m_adapterClient->setToolTip(toQt(tooltip_text)); } void RenderWidgetHostViewQt::SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params ¶ms) diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index 151f49bf6..7ae936bad 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -105,7 +105,6 @@ public: virtual void resize(int width, int height) = 0; virtual void move(const QPoint &) = 0; virtual void inputMethodStateChanged(bool editorVisible) = 0; - virtual void setTooltip(const QString &) = 0; virtual void setClearColor(const QColor &color) = 0; }; diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index 7be9ca7b9..3118c36b1 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -259,6 +259,7 @@ public: const QPixmap &pixmap, const QPoint &offset) = 0; virtual bool isEnabled() const = 0; virtual const QObject *holdingQObject() const = 0; + virtual void setToolTip(const QString& toolTipText) = 0; virtual QSharedPointer<BrowserContextAdapter> browserContextAdapter() = 0; virtual WebContentsAdapter* webContentsAdapter() = 0; |