Additional build fixes for aura

- Fix webcursor
- Fix compile regression for set_visibility -> show() / hide()
- Fix compile regression for ChromeBrowserMainParts

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/8095016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103713 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 41 insertions, 15 deletions

diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index 9c1a9e1..02d7191 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -16,8 +16,10 @@
 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.
 #elif defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSCursor;
@@ -80,7 +82,7 @@ class WebCursor {
   // 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.
@@ -90,6 +92,7 @@ class WebCursor {
   // Return a new GdkCursor* for this cursor.  Only valid if GetCursorType
   // returns GDK_CURSOR_IS_PIXMAP.
   GdkCursor* GetCustomCursor();
+#elif defined(USES_X11)
 #elif defined(OS_MACOSX)
   // Gets an NSCursor* for this cursor.
   NSCursor* GetCursor() const;
@@ -150,11 +153,11 @@ class WebCursor {
   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)
+
 #endif
 };
 
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc
index eb5ea62..209e761 100644
--- a/webkit/glue/webcursor_gtk.cc
+++ b/webkit/glue/webcursor_gtk.cc
@@ -141,22 +141,13 @@ 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);
@@ -191,7 +182,6 @@ GdkCursor* WebCursor::GetCustomCursor() {
     gdk_cursor_unref(unref_);
   unref_ = cursor;
   return cursor;
-#endif
 }
 
 void WebCursor::InitPlatformData() {
diff --git a/webkit/glue/webcursor_x11.cc b/webkit/glue/webcursor_x11.cc
new file mode 100644
index 0000000..d6d4ebd
--- /dev/null
+++ b/webkit/glue/webcursor_x11.cc
@@ -0,0 +1,32 @@
+// 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"
+
+// TODO(davemoore) Need to implement X11 cursors.
+
+gfx::NativeCursor WebCursor::GetNativeCursor() {
+  return NULL;
+}
+
+void WebCursor::InitPlatformData() {
+}
+
+bool WebCursor::SerializePlatformData(Pickle* pickle) const {
+  return true;
+}
+
+bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) {
+  return true;
+}
+
+bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
+  return true;
+}
+
+void WebCursor::CleanupPlatformData() {
+}
+
+void WebCursor::CopyPlatformData(const WebCursor& other) {
+}
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index e6ba8fd..f0fe7e3 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -392,6 +392,7 @@
         'webcursor_gtk_data.h',
         'webcursor_mac.mm',
         'webcursor_win.cc',
+        'webcursor_x11.cc',
         'webdropdata.cc',
         'webdropdata_win.cc',
         'webdropdata.h',