Gtk: add a separator at the right of the browser actions toolbar.

The spacing changes in browser_toolbar_gtk are necessary to get the spacing between the separator and the page menu correct. It shouldn't affect the spacing in any other circumstance.

BUG=none
TEST=visual

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

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

1 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/gtk/gtk_theme_provider.h b/chrome/browser/gtk/gtk_theme_provider.h
index b7310ca..c5a8b5e 100644
--- a/chrome/browser/gtk/gtk_theme_provider.h
+++ b/chrome/browser/gtk/gtk_theme_provider.h
@@ -5,10 +5,12 @@
 #ifndef CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_
 #define CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_
 
+#include <gtk/gtk.h>
 #include <map>
 #include <string>
 #include <vector>
 
+#include "app/gtk_signal.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/owned_widget_gtk.h"
@@ -17,10 +19,6 @@
 class CairoCachedSurface;
 class Profile;
 
-typedef struct _GdkDisplay GdkDisplay;
-typedef struct _GtkStyle GtkStyle;
-typedef struct _GtkWidget GtkWidget;
-
 // Specialization of BrowserThemeProvider which supplies system colors.
 class GtkThemeProvider : public BrowserThemeProvider,
                          public NotificationObserver {
@@ -57,6 +55,9 @@ class GtkThemeProvider : public BrowserThemeProvider,
   // away.
   GtkWidget* BuildChromeButton();
 
+  // FIXME
+  GtkWidget* CreateToolbarSeparator();
+
   // Whether we should use the GTK system theme.
   bool UseGtkTheme() const;
 
@@ -160,8 +161,10 @@ class GtkThemeProvider : public BrowserThemeProvider,
 
   // A notification from the GtkChromeButton GObject destructor that we should
   // remove it from our internal list.
-  static void OnDestroyChromeButton(GtkWidget* button,
-                                    GtkThemeProvider* provider);
+  CHROMEGTK_CALLBACK_0(GtkThemeProvider, void, OnDestroyChromeButton);
+
+  CHROMEGTK_CALLBACK_1(GtkThemeProvider, gboolean, OnSeparatorExpose,
+                       GdkEventExpose*);
 
   // Whether we should be using gtk rendering.
   bool use_gtk_;