Rename UI_API to UI_EXPORT.

R=rvargas@chromium.org
Review URL: http://codereview.chromium.org/7569005

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

7 files changed, 32 insertions, 31 deletions

diff --git a/ui/base/dragdrop/drag_drop_types.h b/ui/base/dragdrop/drag_drop_types.h
index b3d3c8c..e042332 100644
--- a/ui/base/dragdrop/drag_drop_types.h
+++ b/ui/base/dragdrop/drag_drop_types.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
-class UI_API DragDropTypes {
+class UI_EXPORT DragDropTypes {
  public:
   enum DragOperation {
     DRAG_NONE = 0,
diff --git a/ui/base/dragdrop/drag_source.h b/ui/base/dragdrop/drag_source.h
index fb332e2..777a8ee 100644
--- a/ui/base/dragdrop/drag_source.h
+++ b/ui/base/dragdrop/drag_source.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
@@ -18,8 +18,8 @@ namespace ui {
 // drag-drop operation as the user mouses over other drop targets on their
 // system. This object tells Windows whether or not the drag should continue,
 // and supplies the appropriate cursors.
-class UI_API DragSource : public IDropSource,
-                          public base::RefCountedThreadSafe<DragSource> {
+class UI_EXPORT DragSource : public IDropSource,
+                             public base::RefCountedThreadSafe<DragSource> {
  public:
   DragSource();
   virtual ~DragSource() {}
diff --git a/ui/base/dragdrop/drop_target.h b/ui/base/dragdrop/drop_target.h
index 53d88fa..8099a61 100644
--- a/ui/base/dragdrop/drop_target.h
+++ b/ui/base/dragdrop/drop_target.h
@@ -9,7 +9,7 @@
 #include <objidl.h>
 
 #include "base/memory/ref_counted.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 // Windows interface.
 struct IDropTargetHelper;
@@ -25,7 +25,7 @@ namespace ui {
 // before the HWND is deleted too.
 //
 // This class is meant to be used in a STA and is not multithread-safe.
-class UI_API DropTarget : public IDropTarget {
+class UI_EXPORT DropTarget : public IDropTarget {
  public:
   // Create a new DropTarget associating it with the given HWND.
   explicit DropTarget(HWND hwnd);
diff --git a/ui/base/dragdrop/gtk_dnd_util.h b/ui/base/dragdrop/gtk_dnd_util.h
index ab3322e..7703428 100644
--- a/ui/base/dragdrop/gtk_dnd_util.h
+++ b/ui/base/dragdrop/gtk_dnd_util.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 class GURL;
 
@@ -43,7 +43,7 @@ enum {
 
 // Get the atom for a given target (of the above enum type). Will return NULL
 // for non-custom targets, such as CHROME_TEXT_PLAIN.
-UI_API GdkAtom GetAtomForTarget(int target);
+UI_EXPORT GdkAtom GetAtomForTarget(int target);
 
 // Creates a target list from the given mask. The mask should be an OR of
 // CHROME_* values. The target list is returned with ref count 1; the caller
@@ -52,37 +52,38 @@ UI_API GdkAtom GetAtomForTarget(int target);
 // Since the MIME type for WEBDROP_FILE_CONTENTS depends on the file's
 // contents, that flag is ignored by this function. It is the responsibility
 // of the client code to do the right thing.
-UI_API GtkTargetList* GetTargetListFromCodeMask(int code_mask);
+UI_EXPORT GtkTargetList* GetTargetListFromCodeMask(int code_mask);
 
 // Set the drag target list for |source| with the target list that
 // corresponds to |code_mask|.
-UI_API void SetSourceTargetListFromCodeMask(GtkWidget* source, int code_mask);
+UI_EXPORT void SetSourceTargetListFromCodeMask(GtkWidget* source,
+                                               int code_mask);
 
 // Set the accepted targets list for |dest|. The |target_codes| array should
 // be sorted in preference order and should be terminated with -1.
-UI_API void SetDestTargetList(GtkWidget* dest, const int* target_codes);
+UI_EXPORT void SetDestTargetList(GtkWidget* dest, const int* target_codes);
 
 // Write a URL to the selection in the given type.
-UI_API void WriteURLWithName(GtkSelectionData* selection_data,
-                      const GURL& url,
-                      string16 title,
-                      int type);
+UI_EXPORT void WriteURLWithName(GtkSelectionData* selection_data,
+                                const GURL& url,
+                                string16 title,
+                                int type);
 
 // Extracts data of type CHROME_NAMED_URL from |selection_data| into
 // |url| and |title|. Returns true if the url/title were safely extracted
 // and the url is valid.
-UI_API bool ExtractNamedURL(GtkSelectionData* selection_data,
-                            GURL* url,
-                            string16* title);
+UI_EXPORT bool ExtractNamedURL(GtkSelectionData* selection_data,
+                               GURL* url,
+                               string16* title);
 
 // Extracts data of type TEXT_URI_LIST from |selection_data| into |urls|.
-UI_API bool ExtractURIList(GtkSelectionData* selection_data,
-                           std::vector<GURL>* urls);
+UI_EXPORT bool ExtractURIList(GtkSelectionData* selection_data,
+                              std::vector<GURL>* urls);
 
 // Extracts a Netscape URL (url\ntitle) from |selection_data|.
-UI_API bool ExtractNetscapeURL(GtkSelectionData* selection_data,
-                               GURL* url,
-                               string16* title);
+UI_EXPORT bool ExtractNetscapeURL(GtkSelectionData* selection_data,
+                                  GURL* url,
+                                  string16* title);
 
 }  // namespace ui
 
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index 085048d..7de4e57 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -21,7 +21,7 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/dragdrop/download_file_interface.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
 
 class GURL;
 class Pickle;
@@ -42,7 +42,7 @@ namespace ui {
 // TabContentsViewGtk uses a different class to handle drag support that does
 // not use OSExchangeData. As such, file contents and html support is only
 // compiled on windows.
-class UI_API OSExchangeData {
+class UI_EXPORT OSExchangeData {
  public:
   // CustomFormats are used for non-standard data types. For example, bookmark
   // nodes are written using a CustomFormat.
@@ -65,7 +65,7 @@ class UI_API OSExchangeData {
   };
 
   // Encapsulates the info about a file to be downloaded.
-  struct UI_API DownloadFileInfo {
+  struct UI_EXPORT DownloadFileInfo {
     DownloadFileInfo(const FilePath& filename,
                      DownloadFileProvider* downloader);
     ~DownloadFileInfo();
@@ -76,7 +76,7 @@ class UI_API OSExchangeData {
 
   // Provider defines the platform specific part of OSExchangeData that
   // interacts with the native system.
-  class UI_API Provider {
+  class UI_EXPORT Provider {
    public:
     Provider() {}
     virtual ~Provider() {}
diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.h b/ui/base/dragdrop/os_exchange_data_provider_gtk.h
index 840b956..e961e9d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_gtk.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.h
@@ -25,7 +25,7 @@ namespace ui {
 // types can be set on OSExchangeDataProviderGtk by way of the various setters.
 // The various has methods return true if the format was supplied to the
 // constructor, or explicitly set.
-class UI_API OSExchangeDataProviderGtk : public OSExchangeData::Provider {
+class UI_EXPORT OSExchangeDataProviderGtk : public OSExchangeData::Provider {
  public:
   OSExchangeDataProviderGtk(int known_formats,
                             const std::set<GdkAtom>& known_custom_formats_);
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 3e150da..0d75a40 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -11,8 +11,8 @@
 #include <string>
 
 #include "base/win/scoped_comptr.h"
-#include "ui/ui_api.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
@@ -127,7 +127,7 @@ class DataObjectImpl : public DownloadFileObserver,
   Observer* observer_;
 };
 
-class UI_API OSExchangeDataProviderWin : public OSExchangeData::Provider {
+class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
  public:
   // Returns true if source has plain text that is a valid url.
   static bool HasPlainTextURL(IDataObject* source);