Additional build fixes for aura

webkit/glue/webcursor_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webcursor.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 123 matching lines @@
     case WebCursorInfo::TypeGrab:
     case WebCursorInfo::TypeGrabbing:
     case WebCursorInfo::TypeCustom:
       return GDK_CURSOR_IS_PIXMAP;
   }
   NOTREACHED();
   return GDK_LAST_CURSOR;
 }
 
 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);
     case WebCursorInfo::TypeZoomOut:
       return GetInlineCustomCursor(CustomCursorZoomOut);
     case WebCursorInfo::TypeGrab:
       return GetInlineCustomCursor(CustomCursorGrab);
     case WebCursorInfo::TypeGrabbing:
       return GetInlineCustomCursor(CustomCursorGrabbing);
   }
@@ skipping 14 matching lines @@
                                                  pixbuf,
                                                  hotspot_.x(),
                                                  hotspot_.y());
 
   gdk_pixbuf_unref(pixbuf);
 
   if (unref_)
     gdk_cursor_unref(unref_);
   unref_ = cursor;
   return cursor;
-#endif
 }
 
 void WebCursor::InitPlatformData() {
   unref_ = NULL;
   return;
 }
 
 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
   return true;
 }
@@ skipping 12 matching lines @@
     unref_ = NULL;
   }
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   if (other.unref_)
     unref_ = gdk_cursor_ref(other.unref_);
   return;
 }