Remove #ifdefs around ShowLinkDisambiguationPopup

content/public/browser/web_contents_view_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_DELEGATE_H_
 
 #if defined(__OBJC__)
 #import <Cocoa/Cocoa.h>
 #endif
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "content/common/content_export.h"
-#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(__OBJC__)
 @protocol RenderWidgetHostViewMacDelegate;
 #endif
 
 namespace gfx {
+class Rect;
 class Size;
 }
 
 namespace ui {
 class GestureEvent;
 class MouseEvent;
 }
 
 namespace content {
 class RenderFrameHost;
@@ skipping 16 matching lines @@
 
   // These methods allow the embedder to intercept a WebContentsView's
   // implementation of these methods. See the WebContentsView interface
   // documentation for more information about these methods.
   virtual void StoreFocus();
   virtual void RestoreFocus();
   virtual bool Focus();
   virtual void TakeFocus(bool reverse);
   virtual void SizeChanged(const gfx::Size& size);
 
-#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
   // 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
   // they were trying to touch. |target_rect| is the rectangle in DIPs in the
   // coordinate system of |content| that has been scaled up in |zoomed_bitmap|.
   // Should the popup receive any gesture events they should be translated back
   // to the coordinate system of |content| and then provided to the |callback|
   // for forwarding on to the original scale web content.
   virtual void ShowDisambiguationPopup(
       const gfx::Rect& target_rect,
       const SkBitmap& zoomed_bitmap,
       const gfx::NativeView content,
       const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
-      const base::Callback<void(ui::MouseEvent*)>& mouse_cb) = 0;
+      const base::Callback<void(ui::MouseEvent*)>& mouse_cb);
 
   // Hides the link disambiguation popup window if it is showing, otherwise does
   // nothing.
-  virtual void HideDisambiguationPopup() = 0;
-#endif
+  virtual void HideDisambiguationPopup();
 
   // Returns a newly-created delegate for the RenderWidgetHostViewMac, to handle
   // events on the responder chain.
 #if defined(__OBJC__)
   virtual NSObject<RenderWidgetHostViewMacDelegate>*
       CreateRenderWidgetHostViewDelegate(
           RenderWidgetHost* render_widget_host);
 #else
   virtual void* CreateRenderWidgetHostViewDelegate(
       RenderWidgetHost* render_widget_host);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_VIEW_DELEGATE_H_