Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Unified Diff: ui/base/dragdrop/os_exchange_data.h

Issue 2792183002: Delete ash-based code for Windows drag-and-drop graphics. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/dragdrop/os_exchange_data.h
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index 683197de275155f86cc1006e2747d221abd83d19..414733a6a6b6154113b4674ead4fdf4f17323880 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -130,7 +130,7 @@ class UI_BASE_EXPORT OSExchangeData {
virtual bool HasHtml() const = 0;
#endif
-#if defined(USE_AURA) || defined(OS_MACOSX)
+#if (defined(USE_AURA) && !defined(OS_WIN)) || defined(OS_MACOSX)
danakj 2017/04/03 22:34:01 I took them out of the interface on WIN which I th
Peter Kasting 2017/04/04 00:31:14 Maybe this whole #if should be USE_ASH instead?
sadrul 2017/04/04 04:16:14 We do use this on desktop-linux. So maybe just (OS
danakj 2017/04/04 15:33:37 Done.
virtual void SetDragImage(const gfx::ImageSkia& image,
const gfx::Vector2d& cursor_offset) = 0;
virtual const gfx::ImageSkia& GetDragImage() const = 0;

Powered by Google App Engine
This is Rietveld 408576698