diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 17:40:45 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 17:40:45 +0000 |
| commit | c1c05e27a85e5be0c183e73f7a44407fbfe43ab0 (patch) | |
| tree | 6cbf491f10dae971bebe975e3fb623fc8a97a33b /webkit | |
| parent | a32cc589500e0ddca3ba46839860ec9b4b41e14a (diff) | |
| download | chromium_src-c1c05e27a85e5be0c183e73f7a44407fbfe43ab0.zip chromium_src-c1c05e27a85e5be0c183e73f7a44407fbfe43ab0.tar.gz chromium_src-c1c05e27a85e5be0c183e73f7a44407fbfe43ab0.tar.bz2 | |
Revert "Wrap cursor calls with windows ifdef as cursor support only works on windows right now"
TBR=tony
Review URL: http://codereview.chromium.org/7141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webview_impl.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 5d9e08e..ca86104 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -33,9 +33,7 @@ #include "config.h" #pragma warning(push, 0) -#if defined(OS_WIN) #include "Cursor.h" -#endif #include "Document.h" #include "DocumentLoader.h" #include "DragController.h" @@ -55,6 +53,7 @@ #include "KeyboardEvent.h" #include "MIMETypeRegistry.h" #include "Page.h" +#include "Pasteboard.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" #include "PlatformWheelEvent.h" @@ -135,10 +134,10 @@ WebView* WebView::Create(WebViewDelegate* delegate, WebViewImpl::WebViewImpl() : delegate_(NULL), pending_history_item_(NULL), - observed_new_navigation_(false), #ifndef NDEBUG new_navigation_loader_(NULL), #endif + observed_new_navigation_(false), text_zoom_level_(0), context_menu_allowed_(false), doing_drag_and_drop_(false), @@ -249,9 +248,7 @@ void WebViewImpl::MouseContextMenu(const WebMouseEvent& event) { else target_frame = page_->focusController()->focusedOrMainFrame(); -#if defined(OS_WIN) target_frame->view()->setCursor(pointerCursor()); -#endif context_menu_allowed_ = true; target_frame->eventHandler()->sendContextMenuEvent(pme); @@ -1265,7 +1262,7 @@ bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data, *drop_data_copy = drop_data; current_drop_data_.reset(drop_data_copy); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); @@ -1281,7 +1278,7 @@ bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data, bool WebViewImpl::DragTargetDragOver( int client_x, int client_y, int screen_x, int screen_y) { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); @@ -1296,7 +1293,7 @@ bool WebViewImpl::DragTargetDragOver( void WebViewImpl::DragTargetDragLeave() { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()), IntPoint(), IntPoint(), DragOperationNone); #elif defined(OS_MACOSX) @@ -1310,7 +1307,7 @@ void WebViewImpl::DragTargetDragLeave() { void WebViewImpl::DragTargetDrop( int client_x, int client_y, int screen_x, int screen_y) { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); |