Additional build fixes for aura

webkit/glue/webcursor.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBCURSOR_H_
 #define WEBKIT_GLUE_WEBCURSOR_H_
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 #include <vector>
 
 #if defined(OS_WIN)
 typedef struct HINSTANCE__* HINSTANCE;
 typedef struct HICON__* HICON;
 typedef HICON HCURSOR;
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
 typedef struct _GdkCursor GdkCursor;
+#elif defined(USES_X11)
+// TODO(davemoore) define X11 specific cursor implementation.

[tony, 2011/10/04 20:50:33]

Nit: These empty #if defined(USES_X11) blocks are weird.

 #elif defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSCursor;
 #else
 class NSCursor;
 #endif
 typedef UInt32 ThemeCursor;
 struct Cursor;
 #endif
 
@@ skipping 42 matching lines @@
   // Returns a HCURSOR representing the current WebCursor instance.
   // The ownership of the HCURSOR (does not apply to external cursors) remains
   // with the WebCursor instance.
   HCURSOR GetCursor(HINSTANCE module_handle);
 
   // Initialize this from the given Windows cursor. The caller must ensure that
   // the HCURSOR remains valid by not invoking the DestroyCursor/DestroyIcon
   // APIs on it.
   void InitFromExternalCursor(HCURSOR handle);
 
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
   // Return the stock GdkCursorType for this cursor, or GDK_CURSOR_IS_PIXMAP
   // if it's a custom cursor. Return GDK_LAST_CURSOR to indicate that the cursor
   // should be set to the system default.
   // Returns an int so we don't need to include GDK headers in this header file.
   int GetCursorType() const;
 
   // Return a new GdkCursor* for this cursor.  Only valid if GetCursorType
   // returns GDK_CURSOR_IS_PIXMAP.
   GdkCursor* GetCustomCursor();
+#elif defined(USES_X11)

[tony, 2011/10/04 20:50:33]

ditto

 #elif defined(OS_MACOSX)
   // Gets an NSCursor* for this cursor.
   NSCursor* GetCursor() const;
 
   // Initialize this from the given Carbon ThemeCursor.
   void InitFromThemeCursor(ThemeCursor cursor);
 
   // Initialize this from the given Carbon Cursor.
   void InitFromCursor(const Cursor* cursor);
 
@@ skipping 40 matching lines @@
   // Platform-inspecific because it can be serialized.
   gfx::Size custom_size_;
   std::vector<char> custom_data_;
 
 #if defined(OS_WIN)
   // An externally generated HCURSOR. We assume that it remains valid, i.e we
   // don't attempt to copy the HCURSOR.
   HCURSOR external_cursor_;
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
-#endif  // OS_WIN
-
-#if defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
   // A custom cursor created that should be unref'ed from the destructor.
   GdkCursor* unref_;
+#elif defined(USE_X11)
+

[tony, 2011/10/04 20:50:33]

ditto

 #endif
 };
 
 #endif  // WEBKIT_GLUE_WEBCURSOR_H_