Rename UI_API to UI_EXPORT.

ui/base/x/x11_util.h

Index: ui/base/x/x11_util.h
===================================================================
--- ui/base/x/x11_util.h	(revision 95624)
+++ ui/base/x/x11_util.h	(working copy)
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 typedef unsigned long Atom;
 typedef struct _GdkDrawable GdkWindow;
@@ -37,13 +37,13 @@
 // These functions cache their results ---------------------------------
 
 // Check if there's an open connection to an X server.
-UI_API bool XDisplayExists();
+UI_EXPORT bool XDisplayExists();
 // Return an X11 connection for the current, primary display.
 
 // TODO(oshima|evan): This assume there is one display and dosn't work
 // undef mutiple displays/monitor environment. Remove this and change the
 // chrome codebase to get the display from window.
-UI_API Display* GetXDisplay();
+UI_EXPORT Display* GetXDisplay();
 
 // X shared memory comes in three flavors:
 // 1) No SHM support,
@@ -55,10 +55,10 @@
   SHARED_MEMORY_PIXMAP
 };
 // Return the shared memory type of our X connection.
-UI_API SharedMemorySupport QuerySharedMemorySupport(Display* dpy);
+UI_EXPORT SharedMemorySupport QuerySharedMemorySupport(Display* dpy);
 
 // Return true iff the display supports Xrender
-UI_API bool QueryRenderSupport(Display* dpy);
+UI_EXPORT bool QueryRenderSupport(Display* dpy);
 
 // Return the default screen number for the display
 int GetDefaultScreen(Display* display);
@@ -66,32 +66,33 @@
 // These functions do not cache their results --------------------------
 
 // Get the X window id for the default root window
-UI_API XID GetX11RootWindow();
+UI_EXPORT XID GetX11RootWindow();
 // Returns the user's current desktop.
 bool GetCurrentDesktop(int* desktop);
 // Get the X window id for the given GTK widget.
-UI_API XID GetX11WindowFromGtkWidget(GtkWidget* widget);
+UI_EXPORT XID GetX11WindowFromGtkWidget(GtkWidget* widget);
 XID GetX11WindowFromGdkWindow(GdkWindow* window);
 // Get a Visual from the given widget. Since we don't include the Xlib
 // headers, this is returned as a void*.
-UI_API void* GetVisualFromGtkWidget(GtkWidget* widget);
+UI_EXPORT void* GetVisualFromGtkWidget(GtkWidget* widget);
 // Return the number of bits-per-pixel for a pixmap of the given depth
-UI_API int BitsPerPixelForPixmapDepth(Display* display, int depth);
+UI_EXPORT int BitsPerPixelForPixmapDepth(Display* display, int depth);
 // Returns true if |window| is visible.
-UI_API bool IsWindowVisible(XID window);
+UI_EXPORT bool IsWindowVisible(XID window);
 // Returns the bounds of |window|.
-UI_API bool GetWindowRect(XID window, gfx::Rect* rect);
+UI_EXPORT bool GetWindowRect(XID window, gfx::Rect* rect);
 // Return true if |window| has any property with |property_name|.
-UI_API bool PropertyExists(XID window, const std::string& property_name);
+UI_EXPORT bool PropertyExists(XID window, const std::string& property_name);
 // Get the value of an int, int array, atom array or string property.  On
 // success, true is returned and the value is stored in |value|.
-UI_API bool GetIntProperty(XID window, const std::string& property_name,
-                           int* value);
-UI_API bool GetIntArrayProperty(XID window, const std::string& property_name,
-                                std::vector<int>* value);
-UI_API bool GetAtomArrayProperty(XID window, const std::string& property_name,
-                                 std::vector<Atom>* value);
-UI_API bool GetStringProperty(
+UI_EXPORT bool GetIntProperty(XID window, const std::string& property_name,
+                              int* value);
+UI_EXPORT bool GetIntArrayProperty(XID window, const std::string& property_name,
+                                   std::vector<int>* value);
+UI_EXPORT bool GetAtomArrayProperty(XID window,
+                                    const std::string& property_name,
+                                    std::vector<Atom>* value);
+UI_EXPORT bool GetStringProperty(
     XID window, const std::string& property_name, std::string* value);
 
 // Get |window|'s parent window, or None if |window| is the root window.
@@ -119,12 +120,12 @@
 
 // Enumerates all windows in the current display.  Will recurse into child
 // windows up to a depth of |max_depth|.
-UI_API bool EnumerateAllWindows(EnumerateWindowsDelegate* delegate,
-                                int max_depth);
+UI_EXPORT bool EnumerateAllWindows(EnumerateWindowsDelegate* delegate,
+                                   int max_depth);
 
 // Returns all children windows of a given window in top-to-bottom stacking
 // order.
-UI_API bool GetXWindowStack(XID window, std::vector<XID>* windows);
+UI_EXPORT bool GetXWindowStack(XID window, std::vector<XID>* windows);
 
 // Restack a window in relation to one of its siblings.  If |above| is true,
 // |window| will be stacked directly above |sibling|; otherwise it will stacked
@@ -134,38 +135,38 @@
 
 // Return a handle to a X ShmSeg. |shared_memory_key| is a SysV
 // IPC key. The shared memory region must contain 32-bit pixels.
-UI_API XSharedMemoryId AttachSharedMemory(Display* display,
-                                          int shared_memory_support);
-UI_API void DetachSharedMemory(Display* display, XSharedMemoryId shmseg);
+UI_EXPORT XSharedMemoryId AttachSharedMemory(Display* display,
+                                             int shared_memory_support);
+UI_EXPORT void DetachSharedMemory(Display* display, XSharedMemoryId shmseg);
 
 // Return a handle to an XRender picture where |pixmap| is a handle to a
 // pixmap containing Skia ARGB data.
-UI_API XID CreatePictureFromSkiaPixmap(Display* display, XID pixmap);
+UI_EXPORT XID CreatePictureFromSkiaPixmap(Display* display, XID pixmap);
 
 // Draws ARGB data on the given pixmap using the given GC, converting to the
 // server side visual depth as needed.  Destination is assumed to be the same
 // dimensions as |data| or larger.  |data| is also assumed to be in row order
 // with each line being exactly |width| * 4 bytes long.
-UI_API void PutARGBImage(Display* display, void* visual, int depth, XID pixmap,
-                         void* pixmap_gc, const uint8* data, int width,
-                         int height);
+UI_EXPORT void PutARGBImage(Display* display, void* visual, int depth,
+                            XID pixmap, void* pixmap_gc, const uint8* data,
+                            int width, int height);
 
 void FreePicture(Display* display, XID picture);
 void FreePixmap(Display* display, XID pixmap);
 
 // Get the window manager name.
-UI_API bool GetWindowManagerName(std::string* name);
+UI_EXPORT bool GetWindowManagerName(std::string* name);
 
 // Change desktop for |window| to the desktop of |destination| window.
-UI_API bool ChangeWindowDesktop(XID window, XID destination);
+UI_EXPORT bool ChangeWindowDesktop(XID window, XID destination);
 
 // Enable the default X error handlers. These will log the error and abort
 // the process if called. Use SetX11ErrorHandlers() from x11_util_internal.h
 // to set your own error handlers.
-UI_API void SetDefaultX11ErrorHandlers();
+UI_EXPORT void SetDefaultX11ErrorHandlers();
 
 // Return true if a given window is in full-screen mode.
-UI_API bool IsX11WindowFullScreen(XID window);
+UI_EXPORT bool IsX11WindowFullScreen(XID window);
 
 }  // namespace ui