Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: webkit/glue/webview_impl.cc

Issue 7270: Linux compile fixes for webview_impl.cc (Closed)
Patch Set: Linux compile fixes for webview_impl.cc Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webview_impl.cc
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 20e44701b646bc167b773b8536b6b4e8538aede3..90d682967aa43b6a5f247108c80f3e23e538a9f4 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -35,7 +35,9 @@
#include "base/compiler_specific.h"
MSVC_PUSH_WARNING_LEVEL(0);
+#if defined(OS_WIN)
#include "Cursor.h"
+#endif
#include "Document.h"
#include "DocumentLoader.h"
#include "DragController.h"
@@ -55,7 +57,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "KeyboardEvent.h"
#include "MIMETypeRegistry.h"
#include "Page.h"
-#include "Pasteboard.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformWheelEvent.h"
@@ -136,10 +137,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),
@@ -250,7 +251,9 @@ 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);
@@ -1264,7 +1267,7 @@ bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data,
*drop_data_copy = drop_data;
current_drop_data_.reset(drop_data_copy);
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
kDropTargetOperation);
@@ -1280,7 +1283,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)
+#if defined(OS_WIN) || defined(OS_LINUX)
DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
kDropTargetOperation);
@@ -1295,7 +1298,7 @@ bool WebViewImpl::DragTargetDragOver(
void WebViewImpl::DragTargetDragLeave() {
DCHECK(current_drop_data_.get());
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
IntPoint(), IntPoint(), DragOperationNone);
#elif defined(OS_MACOSX)
@@ -1309,7 +1312,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)
+#if defined(OS_WIN) || defined(OS_LINUX)
DragData drag_data(reinterpret_cast<DragDataRef>(current_drop_data_.get()),
IntPoint(client_x, client_y), IntPoint(screen_x, screen_y),
kDropTargetOperation);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698