Commit 572a998c authored by dnicoara's avatar dnicoara Committed by Commit bot

Fix Ozone build

Ozone compiles with USE_AURA=1 TOOLKIT_VIEWS=0 which cases compile
errors due to missing member functions ShowDisambiguationPopup
and HideDisambiguationPopup.

BUG=none
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/596373002

Cr-Commit-Position: refs/heads/master@{#296506}
parent 0fff7fc3
...@@ -187,7 +187,7 @@ void RenderWidgetHostViewChildFrame::SelectionBoundsChanged( ...@@ -187,7 +187,7 @@ void RenderWidgetHostViewChildFrame::SelectionBoundsChanged(
const ViewHostMsg_SelectionBounds_Params& params) { const ViewHostMsg_SelectionBounds_Params& params) {
} }
#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
void RenderWidgetHostViewChildFrame::ShowDisambiguationPopup( void RenderWidgetHostViewChildFrame::ShowDisambiguationPopup(
const gfx::Rect& rect_pixels, const gfx::Rect& rect_pixels,
const SkBitmap& zoomed_bitmap) { const SkBitmap& zoomed_bitmap) {
......
...@@ -137,7 +137,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame ...@@ -137,7 +137,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
const NativeWebKeyboardEvent& event) OVERRIDE; const NativeWebKeyboardEvent& event) OVERRIDE;
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
// RenderWidgetHostViewBase implementation. // RenderWidgetHostViewBase implementation.
virtual void ShowDisambiguationPopup( virtual void ShowDisambiguationPopup(
const gfx::Rect& rect_pixels, const gfx::Rect& rect_pixels,
......
...@@ -82,7 +82,7 @@ class CONTENT_EXPORT RenderViewHostDelegateView { ...@@ -82,7 +82,7 @@ class CONTENT_EXPORT RenderViewHostDelegateView {
virtual void HidePopupMenu() {}; virtual void HidePopupMenu() {};
#endif #endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
// Shows a Link Disambiguation Popup. |target_rect| is the area the user // Shows a Link Disambiguation Popup. |target_rect| is the area the user
// touched that resulted in ambiguity, in DIPs in the host's coordinate // touched that resulted in ambiguity, in DIPs in the host's coordinate
// system, |zoomed_bitmap| is an enlarged image of that |target_rect|, and // system, |zoomed_bitmap| is an enlarged image of that |target_rect|, and
......
...@@ -335,7 +335,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, ...@@ -335,7 +335,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
size_t start_offset, size_t start_offset,
size_t end_offset) {}; size_t end_offset) {};
#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
const SkBitmap& zoomed_bitmap) = 0; const SkBitmap& zoomed_bitmap) = 0;
#endif #endif
......
...@@ -55,7 +55,7 @@ class CONTENT_EXPORT WebContentsViewDelegate { ...@@ -55,7 +55,7 @@ class CONTENT_EXPORT WebContentsViewDelegate {
virtual void TakeFocus(bool reverse); virtual void TakeFocus(bool reverse);
virtual void SizeChanged(const gfx::Size& size); virtual void SizeChanged(const gfx::Size& size);
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
// Shows a popup window containing the |zoomed_bitmap| of web content with // Shows a popup window containing the |zoomed_bitmap| of web content with
// more than one link, allowing the user to more easily select which link // more than one link, allowing the user to more easily select which link
// they were trying to touch. |target_rect| is the rectangle in DIPs in the // they were trying to touch. |target_rect| is the rectangle in DIPs in the
......
...@@ -138,7 +138,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { ...@@ -138,7 +138,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
virtual bool PostProcessEventForPluginIme( virtual bool PostProcessEventForPluginIme(
const NativeWebKeyboardEvent& event) OVERRIDE; const NativeWebKeyboardEvent& event) OVERRIDE;
#endif #endif
#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
virtual void ShowDisambiguationPopup( virtual void ShowDisambiguationPopup(
const gfx::Rect& rect_pixels, const gfx::Rect& rect_pixels,
const SkBitmap& zoomed_bitmap) OVERRIDE {} const SkBitmap& zoomed_bitmap) OVERRIDE {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment