diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/gtk/gtk_floating_container.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/gtk/gtk_floating_container.h')
| -rw-r--r-- | chrome/browser/gtk/gtk_floating_container.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/gtk/gtk_floating_container.h b/chrome/browser/gtk/gtk_floating_container.h index 7cd6b0b..b0eed46 100644 --- a/chrome/browser/gtk/gtk_floating_container.h +++ b/chrome/browser/gtk/gtk_floating_container.h @@ -4,6 +4,7 @@ #ifndef CHROME_BROWSER_GTK_GTK_FLOATING_CONTAINER_H_ #define CHROME_BROWSER_GTK_GTK_FLOATING_CONTAINER_H_ +#pragma once #include <gdk/gdk.h> #include <gtk/gtk.h> @@ -26,7 +27,8 @@ // signature: // // void (*set_floating_position)(GtkFloatingContainer* container, -// GtkAllocation* allocation); +// GtkAllocation* allocation, +// gpointer userdata); // // Your handler should, for each floating widget, set the "x" and "y" child // properties. |