From 0bcde72cee05bb587e7069a490081834e6ceac1c Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Fri, 7 Nov 2008 23:25:03 +0000 Subject: Remove windows-isms from drag & drop. This makes it more portable, fixes some bugs, and removes glue from port. Review URL: http://codereview.chromium.org/9801 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5032 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/port/page/chromium/EventHandlerChromium.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'webkit/port/page') diff --git a/webkit/port/page/chromium/EventHandlerChromium.cpp b/webkit/port/page/chromium/EventHandlerChromium.cpp index d7082e5..2ac7d07 100644 --- a/webkit/port/page/chromium/EventHandlerChromium.cpp +++ b/webkit/port/page/chromium/EventHandlerChromium.cpp @@ -26,7 +26,8 @@ #include "config.h" #include "EventHandler.h" -#include "Clipboard.h" +#include "ChromiumDataObject.h" +#include "ClipboardChromium.h" #include "Cursor.h" #include "FloatPoint.h" #include "FocusController.h" @@ -42,11 +43,6 @@ #include "SelectionController.h" #include "NotImplemented.h" -#if PLATFORM(WIN_OS) -#include "ClipboardWin.h" -#include "WCDataObject.h" -#endif - namespace WebCore { unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey; @@ -132,13 +128,8 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const PassRefPtr EventHandler::createDraggingClipboard() const { -#if PLATFORM(WIN_OS) - COMPtr dataObject; - WCDataObject::createInstance(&dataObject); - return ClipboardWin::create(true, dataObject.get(), ClipboardWritable); -#else - return PassRefPtr(0); -#endif + RefPtr dataObject = ChromiumDataObject::create(); + return ClipboardChromium::create(true, dataObject.get(), ClipboardWritable); } void EventHandler::focusDocumentView() -- cgit v1.1