GTK: Make the gtk port compile with GTK_DISABLE_SINGLE_INCLUDES.

ui/base/gtk/gtk_floating_container.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 "ui/base/gtk/gtk_floating_container.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkprivate.h>
 
 #include <algorithm>
 
 namespace {
 
 enum {
   SET_FLOATING_POSITION,
   LAST_SIGNAL
 };
 
@@ skipping 12 matching lines @@
     GtkFloatingContainerChild* child =
         reinterpret_cast<GtkFloatingContainerChild*>(floating_children->data);
 
     if (child->widget == widget)
       return child;
   }
 
   return NULL;
 }
 
+const GParamFlags kStaticReadWriteProp = static_cast<GParamFlags>(
+    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
 }  // namespace
 
 G_BEGIN_DECLS
 
 static void gtk_floating_container_remove(GtkContainer* container,
                                           GtkWidget* widget);
 static void gtk_floating_container_forall(GtkContainer* container,
                                           gboolean include_internals,
                                           GtkCallback callback,
                                           gpointer callback_data);
@@ skipping 38 matching lines @@
 
   gtk_container_class_install_child_property(
       container_class,
       CHILD_PROP_X,
       g_param_spec_int("x",
                        "X position",
                        "X position of child widget",
                        G_MININT,
                        G_MAXINT,
                        0,
-                       static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+                       kStaticReadWriteProp));
 
   gtk_container_class_install_child_property(
       container_class,
       CHILD_PROP_Y,
       g_param_spec_int("y",
                        "Y position",
                        "Y position of child widget",
                        G_MININT,
                        G_MAXINT,
                        0,
-                       static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+                       kStaticReadWriteProp));
 
   floating_container_signals[SET_FLOATING_POSITION] =
       g_signal_new("set-floating-position",
                    G_OBJECT_CLASS_TYPE(object_class),
                    static_cast<GSignalFlags>(G_SIGNAL_RUN_FIRST |
                                              G_SIGNAL_ACTION),
                    0,
                    NULL, NULL,
                    gtk_marshal_VOID__BOXED,
                    G_TYPE_NONE, 1,
@@ skipping 189 matching lines @@
   child_info->x = 0;
   child_info->y = 0;
 
   gtk_widget_set_parent(widget, GTK_WIDGET(container));
 
   container->floating_children =
       g_list_append(container->floating_children, child_info);
 }
 
 G_END_DECLS