diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 16:26:32 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 16:26:32 +0000 |
| commit | 5440acdce707c3ac0b6bd1d4d8f9c07c85713aec (patch) | |
| tree | 37dfb8f63ad06c1c50db32b51b40a501a1cf795d /webkit/glue | |
| parent | e97fff74c457757cf487edfefccde0e70b99cad9 (diff) | |
| download | chromium_src-5440acdce707c3ac0b6bd1d4d8f9c07c85713aec.zip chromium_src-5440acdce707c3ac0b6bd1d4d8f9c07c85713aec.tar.gz chromium_src-5440acdce707c3ac0b6bd1d4d8f9c07c85713aec.tar.bz2 | |
ifdef around windows code
Review URL: http://codereview.chromium.org/249
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/dragclient_impl.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/webkit/glue/dragclient_impl.cc b/webkit/glue/dragclient_impl.cc index 6f63fc1..b0b465c 100644 --- a/webkit/glue/dragclient_impl.cc +++ b/webkit/glue/dragclient_impl.cc @@ -4,11 +4,17 @@ #include "config.h" +#include "build/build_config.h" + +#if defined(OS_WIN) #include <objidl.h> +#endif #pragma warning(push, 0) +#if defined(OS_WIN) #include "ClipboardWin.h" #include "COMPtr.h" +#endif #include "DragData.h" #include "Frame.h" #include "HitTestResult.h" @@ -60,11 +66,14 @@ void DragClientImpl::startDrag(WebCore::DragImageRef drag_image, // Add a ref to the frame just in case a load occurs mid-drag. RefPtr<WebCore::Frame> frame_protector = frame; +#if defined(OS_WIN) COMPtr<IDataObject> data_object( static_cast<WebCore::ClipboardWin*>(clipboard)->dataObject()); DCHECK(data_object.get()); - WebDropData drop_data; WebDropData::PopulateWebDropData(data_object.get(), &drop_data); +#elif defined(OS_MACOSX) || defined(OS_LINUX) + WebDropData drop_data; +#endif webview_->StartDragging(drop_data); } |