Index: ui/base/dragdrop/gtk_dnd_util.h |
diff --git a/ui/base/dragdrop/gtk_dnd_util.h b/ui/base/dragdrop/gtk_dnd_util.h |
index 88f00a309f13c80074787a5d293beb436c13ba51..b07a86dbcbb527420ecbb9f52ce0ae3289b8750a 100644 |
--- a/ui/base/dragdrop/gtk_dnd_util.h |
+++ b/ui/base/dragdrop/gtk_dnd_util.h |
@@ -10,7 +10,7 @@ |
#include <vector> |
#include "base/strings/string16.h" |
-#include "ui/base/ui_export.h" |
+#include "ui/base/ui_base_export.h" |
class GURL; |
@@ -39,13 +39,12 @@ enum { |
// Custom data for web drag/drop. |
CUSTOM_DATA = 1 << 10, |
- |
INVALID_TARGET = 1 << 11, |
}; |
// 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_EXPORT GdkAtom GetAtomForTarget(int target); |
+UI_BASE_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 |
@@ -54,38 +53,38 @@ UI_EXPORT 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_EXPORT GtkTargetList* GetTargetListFromCodeMask(int code_mask); |
+UI_BASE_EXPORT GtkTargetList* GetTargetListFromCodeMask(int code_mask); |
// Set the drag target list for |source| with the target list that |
// corresponds to |code_mask|. |
-UI_EXPORT void SetSourceTargetListFromCodeMask(GtkWidget* source, |
- int code_mask); |
+UI_BASE_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_EXPORT void SetDestTargetList(GtkWidget* dest, const int* target_codes); |
+UI_BASE_EXPORT void SetDestTargetList(GtkWidget* dest, const int* target_codes); |
// Write a URL to the selection in the given type. |
-UI_EXPORT void WriteURLWithName(GtkSelectionData* selection_data, |
- const GURL& url, |
- base::string16 title, |
- int type); |
+UI_BASE_EXPORT void WriteURLWithName(GtkSelectionData* selection_data, |
+ const GURL& url, |
+ base::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_EXPORT bool ExtractNamedURL(GtkSelectionData* selection_data, |
- GURL* url, |
- base::string16* title); |
+UI_BASE_EXPORT bool ExtractNamedURL(GtkSelectionData* selection_data, |
+ GURL* url, |
+ base::string16* title); |
// Extracts data of type TEXT_URI_LIST from |selection_data| into |urls|. |
-UI_EXPORT bool ExtractURIList(GtkSelectionData* selection_data, |
- std::vector<GURL>* urls); |
+UI_BASE_EXPORT bool ExtractURIList(GtkSelectionData* selection_data, |
+ std::vector<GURL>* urls); |
// Extracts a Netscape URL (url\ntitle) from |selection_data|. |
-UI_EXPORT bool ExtractNetscapeURL(GtkSelectionData* selection_data, |
- GURL* url, |
- base::string16* title); |
+UI_BASE_EXPORT bool ExtractNetscapeURL(GtkSelectionData* selection_data, |
+ GURL* url, |
+ base::string16* title); |
} // namespace ui |