Index: chrome/browser/ui/gtk/gtk_theme_provider.h |
=================================================================== |
--- chrome/browser/ui/gtk/gtk_theme_provider.h (revision 71854) |
+++ chrome/browser/ui/gtk/gtk_theme_provider.h (working copy) |
@@ -9,19 +9,22 @@ |
#include <map> |
#include <vector> |
-#include "app/gtk_integers.h" |
-#include "app/gtk_signal.h" |
#include "base/scoped_ptr.h" |
#include "chrome/browser/prefs/pref_change_registrar.h" |
#include "chrome/browser/themes/browser_theme_provider.h" |
#include "chrome/browser/ui/gtk/owned_widget_gtk.h" |
#include "chrome/common/notification_observer.h" |
#include "gfx/color_utils.h" |
+#include "ui/base/gtk/gtk_integers.h" |
+#include "ui/base/gtk/gtk_signal.h" |
class CairoCachedSurface; |
-class GtkSignalRegistrar; |
class Profile; |
+namespace ui { |
+class GtkSignalRegistrar; |
+} |
+ |
typedef struct _GdkDisplay GdkDisplay; |
typedef struct _GdkEventExpose GdkEventExpose; |
typedef struct _GdkPixbuf GdkPixbuf; |
@@ -256,7 +259,7 @@ |
std::vector<GtkWidget*> chrome_buttons_; |
// Tracks all the signals we have connected to on various widgets. |
- scoped_ptr<GtkSignalRegistrar> signals_; |
+ scoped_ptr<ui::GtkSignalRegistrar> signals_; |
// Tints and colors calculated by LoadGtkValues() that are given to the |
// caller while |use_gtk_| is true. |