Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / public / browser / web_contents_view_delegate.h

diff --git a/src/content/public/browser/web_contents_view_delegate.h b/src/content/public/browser/web_contents_view_delegate.h
index 0b4b3c3..ecbd0ff 100644 (file)
--- a/src/content/public/browser/web_contents_view_delegate.h
+++ b/src/content/public/browser/web_contents_view_delegate.h
@@ -9,9 +9,8 @@
 #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__)
@@ -19,6 +18,7 @@
 #endif
 
 namespace gfx {
+class Rect;
 class Size;
 }
 
@@ -55,7 +55,6 @@ class CONTENT_EXPORT WebContentsViewDelegate {
   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
@@ -68,12 +67,11 @@ class CONTENT_EXPORT WebContentsViewDelegate {
       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.