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

Unified Diff: webkit/glue/webcursor_gtk.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 years, 3 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
Index: webkit/glue/webcursor_gtk.cc
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc
index 209e761b6cc99c54c029994715d4ae87b87a827a..eb5ea62edb55d5707c9556d7c0e9008d5ab7b3c0 100644
--- a/webkit/glue/webcursor_gtk.cc
+++ b/webkit/glue/webcursor_gtk.cc
@@ -141,13 +141,22 @@ int WebCursor::GetCursorType() const {
}
gfx::NativeCursor WebCursor::GetNativeCursor() {
+#if defined(USE_AURA)
+ // TODO(saintlou):
+ return NULL;
+#else
int type = GetCursorType();
if (type == GDK_CURSOR_IS_PIXMAP)
return GetCustomCursor();
return gfx::GetCursor(type);
+#endif
}
GdkCursor* WebCursor::GetCustomCursor() {
+#if defined(USE_AURA)
+ // TODO(saintlou):
+ return NULL;
+#else
switch (type_) {
case WebCursorInfo::TypeZoomIn:
return GetInlineCustomCursor(CustomCursorZoomIn);
@@ -182,6 +191,7 @@ GdkCursor* WebCursor::GetCustomCursor() {
gdk_cursor_unref(unref_);
unref_ = cursor;
return cursor;
+#endif
}
void WebCursor::InitPlatformData() {

Powered by Google App Engine
This is Rietveld 408576698