diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 23:25:03 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 23:25:03 +0000 |
| commit | 0bcde72cee05bb587e7069a490081834e6ceac1c (patch) | |
| tree | 7b5e59f055a1f038ceb7e891a054c26acc6d1d7e /webkit/port/page | |
| parent | 4f8b87a4c6d06ebad053160a61fc90492afc8439 (diff) | |
| download | chromium_src-0bcde72cee05bb587e7069a490081834e6ceac1c.zip chromium_src-0bcde72cee05bb587e7069a490081834e6ceac1c.tar.gz chromium_src-0bcde72cee05bb587e7069a490081834e6ceac1c.tar.bz2 | |
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
Diffstat (limited to 'webkit/port/page')
| -rw-r--r-- | webkit/port/page/chromium/EventHandlerChromium.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
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<Clipboard> EventHandler::createDraggingClipboard() const { -#if PLATFORM(WIN_OS) - COMPtr<WCDataObject> dataObject; - WCDataObject::createInstance(&dataObject); - return ClipboardWin::create(true, dataObject.get(), ClipboardWritable); -#else - return PassRefPtr<Clipboard>(0); -#endif + RefPtr<ChromiumDataObject> dataObject = ChromiumDataObject::create(); + return ClipboardChromium::create(true, dataObject.get(), ClipboardWritable); } void EventHandler::focusDocumentView() |