summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authortbarzic <tbarzic@chromium.org>2015-04-02 11:06:05 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 18:07:50 +0000
commit93e15e73465e5a3e692446129b20666a3d6662c4 (patch)
treeb98f0fcebf3ce991983198ee154f5914c593e4cf /content/public
parent36c686ef6be7c9b5265717fc23c062ff0f8ee369 (diff)
downloadchromium_src-93e15e73465e5a3e692446129b20666a3d6662c4.zip
chromium_src-93e15e73465e5a3e692446129b20666a3d6662c4.tar.gz
chromium_src-93e15e73465e5a3e692446129b20666a3d6662c4.tar.bz2
Revert of content: Delete some now-dead event related code. (patchset #2 id:20001 of https://codereview.chromium.org/1052063002/)
Reason for revert: Breaking cros waterfalls. e.g. http://build.chromium.org/p/chromiumos.chromium/builders/Daisy%20%28chromium%29 chromeos-chrome-43.0.2356.0_alpha-r1: ../../../../../../../home/chrome-bot/chrome_root/src/content/browser/renderer_host/render_widget_host_view_aura.cc: In member function 'virtual void content::RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent*)': chromeos-chrome-43.0.2356.0_alpha-r1: ../../../../../../../home/chrome-bot/chrome_root/src/content/browser/renderer_host/render_widget_host_view_aura.cc:2122:27: error: variable 'delegate' set but not used [-Werror=unused-but-set-variable] chromeos-chrome-43.0.2356.0_alpha-r1: RenderViewHostDelegate* delegate = NULL; chromeos-chrome-43.0.2356.0_alpha-r1: ^ Original issue's description: > content: Delete some now-dead event related code. > > Some of the removed methods were never used, and the rest had no > real implementations. > > BUG=None > R=jam@chromium.org > > Committed: https://chromium.googlesource.com/chromium/src/+/3b4f45c0f82a245b6ae1da2492f75e0cef3c2301 TBR=jam@chromium.org,sadrul@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1053063002 Cr-Commit-Position: refs/heads/master@{#323539}
Diffstat (limited to 'content/public')
-rw-r--r--content/public/browser/web_contents_delegate.cc4
-rw-r--r--content/public/browser/web_contents_delegate.h20
2 files changed, 24 insertions, 0 deletions
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 0e48d7c..461927c 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -67,6 +67,10 @@ bool WebContentsDelegate::TakeFocus(WebContents* source, bool reverse) {
return false;
}
+int WebContentsDelegate::GetExtraRenderViewHeight() const {
+ return 0;
+}
+
void WebContentsDelegate::CanDownload(
RenderViewHost* render_view_host,
const GURL& url,
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index 1367f0b..d88b27c 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -56,6 +56,8 @@ class Size;
namespace blink {
class WebGestureEvent;
+class WebLayer;
+struct WebWindowFeatures;
}
namespace content {
@@ -233,6 +235,11 @@ class CONTENT_EXPORT WebContentsDelegate {
const std::string& request_method,
const base::Callback<void(bool)>& callback);
+ // Return much extra vertical space should be allotted to the
+ // render view widget during various animations (e.g. infobar closing).
+ // This is used to make painting look smoother.
+ virtual int GetExtraRenderViewHeight() const;
+
// Returns true if the context menu operation was handled by the delegate.
virtual bool HandleContextMenu(const content::ContextMenuParams& params);
@@ -258,6 +265,13 @@ class CONTENT_EXPORT WebContentsDelegate {
virtual void HandleKeyboardEvent(WebContents* source,
const NativeWebKeyboardEvent& event) {}
+ virtual void HandleMouseDown() {}
+ virtual void HandleMouseUp() {}
+
+ // Handles activation resulting from a pointer event (e.g. when mouse is
+ // pressed, or a touch-gesture begins).
+ virtual void HandlePointerActivate() {}
+
// Allows delegates to handle gesture events before sending to the renderer.
// Returns true if the |event| was handled and thus shouldn't be processed
// by the renderer's event handler. Note that the touch events that create
@@ -267,6 +281,9 @@ class CONTENT_EXPORT WebContentsDelegate {
WebContents* source,
const blink::WebGestureEvent& event);
+ virtual void HandleGestureBegin() {}
+ virtual void HandleGestureEnd() {}
+
// Called when an external drag event enters the web contents window. Return
// true to allow dragging and dropping on the web contents window or false to
// cancel the operation. This method is used by Chromium Embedded Framework.
@@ -274,6 +291,9 @@ class CONTENT_EXPORT WebContentsDelegate {
const DropData& data,
blink::WebDragOperationsMask operations_allowed);
+ // Render view drag n drop ended.
+ virtual void DragEnded() {}
+
// Shows the repost form confirmation dialog box.
virtual void ShowRepostFormWarningDialog(WebContents* source) {}