summaryrefslogtreecommitdiffstats
path: root/ui/base/dragdrop
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base/dragdrop')
-rw-r--r--ui/base/dragdrop/cocoa_dnd_util.h14
-rw-r--r--ui/base/dragdrop/download_file_interface.h6
-rw-r--r--ui/base/dragdrop/drag_drop_types.h4
-rw-r--r--ui/base/dragdrop/drag_source_win.h4
-rw-r--r--ui/base/dragdrop/drag_utils.h24
-rw-r--r--ui/base/dragdrop/drop_target_event.h2
-rw-r--r--ui/base/dragdrop/drop_target_win.h4
-rw-r--r--ui/base/dragdrop/gtk_dnd_util.h37
-rw-r--r--ui/base/dragdrop/os_exchange_data.h10
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_aura.h2
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_aurax11.h2
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_win.h5
12 files changed, 57 insertions, 57 deletions
diff --git a/ui/base/dragdrop/cocoa_dnd_util.h b/ui/base/dragdrop/cocoa_dnd_util.h
index 5b41014..1945c17 100644
--- a/ui/base/dragdrop/cocoa_dnd_util.h
+++ b/ui/base/dragdrop/cocoa_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;
@@ -20,24 +20,24 @@ namespace ui {
// any data associated with this type; it's only used to ensure that Chrome
// supports any drag initiated inside of Chrome, whether or not data has been
// associated with it.
-UI_EXPORT extern NSString* const kChromeDragDummyPboardType;
+UI_BASE_EXPORT extern NSString* const kChromeDragDummyPboardType;
// Mail.app and TextEdit accept drags that have both HTML and image flavors on
// them, but don't process them correctly <http://crbug.com/55879>. Therefore,
// if there is an image flavor, don't put the HTML data on as HTML, but rather
// put it on as this Chrome-only flavor. External apps won't see HTML but
// Chrome will know enough to read it as HTML. <http://crbug.com/55879>
-UI_EXPORT extern NSString* const kChromeDragImageHTMLPboardType;
+UI_BASE_EXPORT extern NSString* const kChromeDragImageHTMLPboardType;
// Populates the |url| and |title| with URL data in |pboard|. There may be more
// than one, but we only handle dropping the first. |url| must not be |NULL|;
// |title| is an optional parameter. Returns |YES| if URL data was obtained from
// the pasteboard, |NO| otherwise. If |convert_filenames| is |YES|, the function
// will also attempt to convert filenames in |pboard| to file URLs.
-UI_EXPORT BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
- base::string16* title,
- NSPasteboard* pboard,
- BOOL convert_filenames);
+UI_BASE_EXPORT BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
+ base::string16* title,
+ NSPasteboard* pboard,
+ BOOL convert_filenames);
} // namespace ui
diff --git a/ui/base/dragdrop/download_file_interface.h b/ui/base/dragdrop/download_file_interface.h
index c157950..327fe79 100644
--- a/ui/base/dragdrop/download_file_interface.h
+++ b/ui/base/dragdrop/download_file_interface.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
#if defined(OS_WIN)
#include <objidl.h>
@@ -25,7 +25,7 @@ namespace ui {
// TODO(benjhayden, anybody): Do these need to be RefCountedThreadSafe?
// Defines the interface to observe the status of file download.
-class UI_EXPORT DownloadFileObserver
+class UI_BASE_EXPORT DownloadFileObserver
: public base::RefCountedThreadSafe<DownloadFileObserver> {
public:
virtual void OnDownloadCompleted(const base::FilePath& file_path) = 0;
@@ -37,7 +37,7 @@ class UI_EXPORT DownloadFileObserver
};
// Defines the interface to control how a file is downloaded.
-class UI_EXPORT DownloadFileProvider
+class UI_BASE_EXPORT DownloadFileProvider
: public base::RefCountedThreadSafe<DownloadFileProvider> {
public:
// Starts the download asynchronously and returns immediately.
diff --git a/ui/base/dragdrop/drag_drop_types.h b/ui/base/dragdrop/drag_drop_types.h
index ea57f95..b626b5a 100644
--- a/ui/base/dragdrop/drag_drop_types.h
+++ b/ui/base/dragdrop/drag_drop_types.h
@@ -6,11 +6,11 @@
#define UI_BASE_DRAGDROP_DRAG_DROP_TYPES_H_
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
namespace ui {
-class UI_EXPORT DragDropTypes {
+class UI_BASE_EXPORT DragDropTypes {
public:
enum DragOperation {
DRAG_NONE = 0,
diff --git a/ui/base/dragdrop/drag_source_win.h b/ui/base/dragdrop/drag_source_win.h
index 7c03b6c..cec2aa1 100644
--- a/ui/base/dragdrop/drag_source_win.h
+++ b/ui/base/dragdrop/drag_source_win.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
namespace ui {
@@ -17,7 +17,7 @@ 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_EXPORT DragSourceWin
+class UI_BASE_EXPORT DragSourceWin
: public IDropSource,
public base::RefCountedThreadSafe<DragSourceWin> {
public:
diff --git a/ui/base/dragdrop/drag_utils.h b/ui/base/dragdrop/drag_utils.h
index d31c628..5b7235f 100644
--- a/ui/base/dragdrop/drag_utils.h
+++ b/ui/base/dragdrop/drag_utils.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/files/file_path.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
class GURL;
@@ -30,25 +30,25 @@ namespace drag_utils {
// Chrome (via the download manager, for example). The drag image is set into
// the supplied data_object. 'file_name' can be a full path, but the directory
// portion will be truncated in the drag image.
-UI_EXPORT void CreateDragImageForFile(const base::FilePath& file_name,
- const gfx::ImageSkia* icon,
- ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void CreateDragImageForFile(const base::FilePath& file_name,
+ const gfx::ImageSkia* icon,
+ ui::OSExchangeData* data_object);
// Sets the drag image on data_object from the supplied canvas. width/height
// are the size of the image to use, and the offsets give the location of
// the hotspot for the drag image.
-UI_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
- const gfx::Size& size,
- const gfx::Vector2d& cursor_offset,
- ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
+ const gfx::Size& size,
+ const gfx::Vector2d& cursor_offset,
+ ui::OSExchangeData* data_object);
// Sets the drag image on data_object from the supplied ImageSkia. width/height
// are the size of the image to use, and the offsets give the location of
// the hotspot for the drag image.
-UI_EXPORT void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
- const gfx::Size& size,
- const gfx::Vector2d& cursor_offset,
- ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
+ const gfx::Size& size,
+ const gfx::Vector2d& cursor_offset,
+ ui::OSExchangeData* data_object);
} // namespace drag_utils
diff --git a/ui/base/dragdrop/drop_target_event.h b/ui/base/dragdrop/drop_target_event.h
index 88fcfc1..18c0630 100644
--- a/ui/base/dragdrop/drop_target_event.h
+++ b/ui/base/dragdrop/drop_target_event.h
@@ -10,7 +10,7 @@
namespace ui {
-class UI_EXPORT DropTargetEvent : public LocatedEvent {
+class UI_BASE_EXPORT DropTargetEvent : public LocatedEvent {
public:
DropTargetEvent(const OSExchangeData& data,
const gfx::Point& location,
diff --git a/ui/base/dragdrop/drop_target_win.h b/ui/base/dragdrop/drop_target_win.h
index 0f8c56d..4536f1d 100644
--- a/ui/base/dragdrop/drop_target_win.h
+++ b/ui/base/dragdrop/drop_target_win.h
@@ -8,7 +8,7 @@
#include <objidl.h>
#include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
// Windows interface.
struct IDropTargetHelper;
@@ -24,7 +24,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_EXPORT DropTargetWin : public IDropTarget {
+class UI_BASE_EXPORT DropTargetWin : public IDropTarget {
public:
// Create a new DropTarget associating it with the given HWND.
explicit DropTargetWin(HWND hwnd);
diff --git a/ui/base/dragdrop/gtk_dnd_util.h b/ui/base/dragdrop/gtk_dnd_util.h
index 88f00a3..b07a86d 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
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index a7c85d90..f62a0d1 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -21,7 +21,7 @@
#include "base/memory/scoped_ptr.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/dragdrop/download_file_interface.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
class GURL;
class Pickle;
@@ -47,7 +47,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_EXPORT OSExchangeData {
+class UI_BASE_EXPORT OSExchangeData {
public:
// CustomFormats are used for non-standard data types. For example, bookmark
// nodes are written using a CustomFormat.
@@ -69,7 +69,7 @@ class UI_EXPORT OSExchangeData {
};
// Encapsulates the info about a file to be downloaded.
- struct UI_EXPORT DownloadFileInfo {
+ struct UI_BASE_EXPORT DownloadFileInfo {
DownloadFileInfo(const base::FilePath& filename,
DownloadFileProvider* downloader);
~DownloadFileInfo();
@@ -79,7 +79,7 @@ class UI_EXPORT OSExchangeData {
};
// Encapsulates the info about a file.
- struct UI_EXPORT FileInfo {
+ struct UI_BASE_EXPORT FileInfo {
FileInfo(const base::FilePath& path, const base::FilePath& display_name);
~FileInfo();
@@ -91,7 +91,7 @@ class UI_EXPORT OSExchangeData {
// Provider defines the platform specific part of OSExchangeData that
// interacts with the native system.
- class UI_EXPORT Provider {
+ class UI_BASE_EXPORT Provider {
public:
Provider() {}
virtual ~Provider() {}
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
index e734f42..5598edd 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
@@ -19,7 +19,7 @@ namespace ui {
class Clipboard;
// OSExchangeData::Provider implementation for aura on linux.
-class UI_EXPORT OSExchangeDataProviderAura
+class UI_BASE_EXPORT OSExchangeDataProviderAura
: public OSExchangeData::Provider {
public:
OSExchangeDataProviderAura();
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 76cfad3..0d16351 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -29,7 +29,7 @@ namespace ui {
class Clipboard;
// OSExchangeData::Provider implementation for aura on linux.
-class UI_EXPORT OSExchangeDataProviderAuraX11
+class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
: public OSExchangeData::Provider,
public base::MessagePumpDispatcher {
public:
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index ee3ccd7..300ea84 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -21,7 +21,7 @@
#include "base/memory/scoped_vector.h"
#include "base/win/scoped_comptr.h"
#include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/vector2d.h"
@@ -124,7 +124,8 @@ class DataObjectImpl : public DownloadFileObserver,
Observer* observer_;
};
-class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
+class UI_BASE_EXPORT OSExchangeDataProviderWin
+ : public OSExchangeData::Provider {
public:
// Returns true if source has plain text that is a valid url.
static bool HasPlainTextURL(IDataObject* source);
generated by cgit v1.1 at 2025-05-17 22:57:55 +0000