5 files changed, 18 insertions, 17 deletions
diff --git a/ui/base/gtk/event_synthesis_gtk.h b/ui/base/gtk/event_synthesis_gtk.h
index 93ba86ca..f7d16d6 100644
--- a/ui/base/gtk/event_synthesis_gtk.h
+++ b/ui/base/gtk/event_synthesis_gtk.h
@@ -15,19 +15,19 @@
 #include <vector>
 
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
 // Creates and returns a key event. Passes ownership to the caller.
-UI_API GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window,
-                                    bool press,
-                                    guint gdk_key,
-                                    guint state);
+UI_EXPORT GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window,
+                                       bool press,
+                                       guint gdk_key,
+                                       guint state);
 
 // Creates the proper sequence of key events for a key press + release.
 // Ownership of the events in the vector is passed to the caller.
-UI_API void SynthesizeKeyPressEvents(
+UI_EXPORT void SynthesizeKeyPressEvents(
     GdkWindow* window,
     KeyboardCode key,
     bool control, bool shift, bool alt,
diff --git a/ui/base/gtk/g_object_destructor_filo.h b/ui/base/gtk/g_object_destructor_filo.h
index 0297a8c..d44bd7f 100644
--- a/ui/base/gtk/g_object_destructor_filo.h
+++ b/ui/base/gtk/g_object_destructor_filo.h
@@ -11,7 +11,7 @@
 #include <list>
 
 #include "base/memory/singleton.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 typedef struct _GObject GObject;
 
@@ -47,7 +47,7 @@ namespace ui {
 // TODO(glotov): Probably worth adding ScopedGObjectDtor<T>.
 //
 // This class is a singleton. Not thread safe. Must be called within UI thread.
-class UI_API GObjectDestructorFILO {
+class UI_EXPORT GObjectDestructorFILO {
  public:
   typedef void (*DestructorHook)(void* context, GObject* where_the_object_was);
 
diff --git a/ui/base/gtk/gtk_im_context_util.h b/ui/base/gtk/gtk_im_context_util.h
index 0cd23db..ae7f2a1 100644
--- a/ui/base/gtk/gtk_im_context_util.h
+++ b/ui/base/gtk/gtk_im_context_util.h
@@ -8,7 +8,7 @@
 
 #include <pango/pango-attributes.h>
 
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
@@ -16,10 +16,11 @@ struct CompositionText;
 
 // Extracts composition text information (text, underlines, selection range)
 // from given Gtk preedit data (utf-8 text, pango attributes, cursor position).
-UI_API void ExtractCompositionTextFromGtkPreedit(const gchar* utf8_text,
-                                                 PangoAttrList* attrs,
-                                                 int cursor_position,
-                                                 CompositionText* composition);
+UI_EXPORT void ExtractCompositionTextFromGtkPreedit(
+    const gchar* utf8_text,
+    PangoAttrList* attrs,
+    int cursor_position,
+    CompositionText* composition);
 
 }  // namespace ui
 
diff --git a/ui/base/gtk/gtk_signal_registrar.h b/ui/base/gtk/gtk_signal_registrar.h
index 3c4e0e8..630ba31 100644
--- a/ui/base/gtk/gtk_signal_registrar.h
+++ b/ui/base/gtk/gtk_signal_registrar.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 typedef void (*GCallback) (void);
 typedef struct _GObject GObject;
@@ -38,7 +38,7 @@ namespace ui {
 //
 // When |signals_| goes down, it will disconnect the handlers connected via
 // Connect.
-class UI_API GtkSignalRegistrar {
+class UI_EXPORT GtkSignalRegistrar {
  public:
   GtkSignalRegistrar();
   ~GtkSignalRegistrar();
diff --git a/ui/base/gtk/gtk_windowing.h b/ui/base/gtk/gtk_windowing.h
index 85696e3..93a9335 100644
--- a/ui/base/gtk/gtk_windowing.h
+++ b/ui/base/gtk/gtk_windowing.h
@@ -7,12 +7,12 @@
 
 #include <gtk/gtk.h>
 
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
 // Stacks a |popup| window directly on top of a |toplevel| window.
-UI_API void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
+UI_EXPORT void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
 
 }  // namespace ui