Upwards compatibility for Win8 SDK IDataObjectAsyncCapability/IAsyncOperation

ui/base/dragdrop/os_exchange_data_provider_win.h

Index: ui/base/dragdrop/os_exchange_data_provider_win.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 760719fc2a80f1645b7fd7f5cada6b2ed8fe3805..3f3fb89be8b5e7b118711c248bd61a2ec96b1676 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -10,6 +10,16 @@
 #include <shlobj.h>
 #include <string>
 
+// Win8 SDK compatibility, see
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb776309(v=vs.85).aspx

[cpu_(ooo_6.6-7.5), 2012/06/15 18:26:47]

url shortener pls.

[scottmg, 2012/06/15 19:16:38]

Done.

+// "Note: This interface has been renamed IDataObjectAsyncCapability."
+// If we're building on pre-8 we define it to its old name. It's documented as
+// being binary compatible.
+#ifndef __IDataObjectAsyncCapability_FWD_DEFINED__
+#define IDataObjectAsyncCapability IAsyncOperation
+#define IID_IDataObjectAsyncCapability IID_IAsyncOperation
+#endif
+
 #include "base/win/scoped_comptr.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_export.h"
@@ -18,7 +28,7 @@ namespace ui {
 
 class DataObjectImpl : public DownloadFileObserver,
                        public IDataObject,
-                       public IAsyncOperation {
+                       public IDataObjectAsyncCapability {
  public:
   class Observer {
    public:
@@ -55,7 +65,7 @@ class DataObjectImpl : public DownloadFileObserver,
   HRESULT __stdcall DUnadvise(DWORD connection);
   HRESULT __stdcall EnumDAdvise(IEnumSTATDATA** enumerator);
 
-  // IAsyncOperation implementation:
+  // IDataObjectAsyncCapability implementation:
   HRESULT __stdcall EndOperation(
       HRESULT result, IBindCtx* reserved, DWORD effects);
   HRESULT __stdcall GetAsyncMode(BOOL* is_op_async);
@@ -138,7 +148,8 @@ class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
 
   static DataObjectImpl* GetDataObjectImpl(const OSExchangeData& data);
   static IDataObject* GetIDataObject(const OSExchangeData& data);
-  static IAsyncOperation* GetIAsyncOperation(const OSExchangeData& data);
+  static IDataObjectAsyncCapability* GetIAsyncOperation(
+      const OSExchangeData& data);
 
   explicit OSExchangeDataProviderWin(IDataObject* source);
   OSExchangeDataProviderWin();
@@ -146,7 +157,7 @@ class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
   virtual ~OSExchangeDataProviderWin();
 
   IDataObject* data_object() const { return data_.get(); }
-  IAsyncOperation* async_operation() const { return data_.get(); }
+  IDataObjectAsyncCapability* async_operation() const { return data_.get(); }
 
   // OSExchangeData::Provider methods.
   virtual void SetString(const string16& data);