From db46baffab77cd546f16b4b4ccf09bc86d9ef208 Mon Sep 17 00:00:00 2001 From: Arvid Nilsson Date: Tue, 1 Apr 2014 16:04:46 +0200 Subject: Add the base qualifier where base::string16 is used Be explicit about this since the "using base::string16" statement will be going away eventually. Change-Id: I292928345eec746bea04e15a3f25e46193704463 Reviewed-by: Pierre Rossi Reviewed-by: Andras Becsi --- src/core/render_widget_host_view_qt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/render_widget_host_view_qt.h') diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index a931ad6b9..7ecfe7ecb 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -136,7 +136,7 @@ public: virtual void DidUpdateBackingStore(const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, const std::vector& copy_rects, const ui::LatencyInfo&) Q_DECL_OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus, int) Q_DECL_OVERRIDE; virtual void Destroy() Q_DECL_OVERRIDE; - virtual void SetTooltipText(const string16 &tooltip_text) Q_DECL_OVERRIDE; + virtual void SetTooltipText(const base::string16 &tooltip_text) Q_DECL_OVERRIDE; virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&) Q_DECL_OVERRIDE; virtual void ScrollOffsetChanged() Q_DECL_OVERRIDE; virtual void CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& /* dst_size */, const base::Callback& callback) Q_DECL_OVERRIDE; @@ -159,7 +159,7 @@ public: virtual void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) Q_DECL_OVERRIDE; // Overridden from RenderWidgetHostViewBase. - virtual void SelectionChanged(const string16 &text, size_t offset, const gfx::Range &range) Q_DECL_OVERRIDE; + virtual void SelectionChanged(const base::string16 &text, size_t offset, const gfx::Range &range) Q_DECL_OVERRIDE; // Overridden from ui::GestureEventHelper. virtual bool CanDispatchToConsumer(ui::GestureConsumer*) Q_DECL_OVERRIDE; -- cgit v1.2.3