summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/tab_contents
diff options
context:
space:
mode:
authorsnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 18:07:27 +0000
committersnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 18:07:27 +0000
commit5382cd819d014c1ccbb64f4921a85db1cba341e1 (patch)
tree87748788c3bd43b70e28e9d11ec3f1fac19d5599 /chrome/browser/views/tab_contents
parent4fea07faa60c88589599bf60b33a36961be68491 (diff)
downloadchromium_src-5382cd819d014c1ccbb64f4921a85db1cba341e1.zip
chromium_src-5382cd819d014c1ccbb64f4921a85db1cba341e1.tar.gz
chromium_src-5382cd819d014c1ccbb64f4921a85db1cba341e1.tar.bz2
Fix linux-views build by adding a header change I missed in my previous checkin (r25629).
BUG=http://code.google.com/p/chromium/issues/detail?id=14654, http://code.google.com/p/chromium/issues/detail?id=20985 TEST=LayoutTests/fast/events/drag-dropeffect.html, LayoutTests/editing/pasteboard/files-during-page-drags.html Review URL: http://codereview.chromium.org/192040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tab_contents')
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_view_gtk.cc2
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_view_gtk.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
index 75467ab..8ca4d16 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
@@ -26,6 +26,8 @@
#include "views/controls/native/native_view_host.h"
#include "views/widget/root_view.h"
+using WebKit::WebDragOperation;
+using WebKit::WebDragOperationsMask;
using WebKit::WebInputEvent;
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
index 561267b..71fbdf6 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
@@ -49,8 +49,9 @@ class TabContentsViewGtk : public TabContentsView,
// Backend implementation of RenderViewHostDelegate::View.
virtual void ShowContextMenu(const ContextMenuParams& params);
- virtual void StartDragging(const WebDropData& drop_data);
- virtual void UpdateDragCursor(bool is_drop_target);
+ virtual void StartDragging(const WebDropData& drop_data,
+ WebKit::WebDragOperationsMask ops_allowed);
+ virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
virtual void GotFocus();
virtual void TakeFocus(bool reverse);
virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);