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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.cc

Issue 10537183: Upwards compatibility for Win8 SDK IDataObjectAsyncCapability/IAsyncOperation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shorten url Created 8 years, 6 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
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/os_exchange_data_provider_win.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index d5c5bf58eb3bd7578d6aeef71d1d3f7155740988..1c8b1c5ff751665b823da9457f924e6c0d174872 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -246,7 +246,7 @@ IDataObject* OSExchangeDataProviderWin::GetIDataObject(
}
// static
-IAsyncOperation* OSExchangeDataProviderWin::GetIAsyncOperation(
+IDataObjectAsyncCapability* OSExchangeDataProviderWin::GetIAsyncOperation(
const OSExchangeData& data) {
return static_cast<const OSExchangeDataProviderWin*>(&data.provider())->
async_operation();
@@ -754,7 +754,7 @@ HRESULT DataObjectImpl::EnumDAdvise(IEnumSTATDATA** enumerator) {
}
///////////////////////////////////////////////////////////////////////////////
-// DataObjectImpl, IAsyncOperation implementation:
+// DataObjectImpl, IDataObjectAsyncCapability implementation:
HRESULT DataObjectImpl::EndOperation(
HRESULT result, IBindCtx* reserved, DWORD effects) {
@@ -790,8 +790,9 @@ HRESULT DataObjectImpl::QueryInterface(const IID& iid, void** object) {
return E_POINTER;
if (IsEqualIID(iid, IID_IDataObject) || IsEqualIID(iid, IID_IUnknown)) {
*object = static_cast<IDataObject*>(this);
- } else if (in_async_mode_ && IsEqualIID(iid, IID_IAsyncOperation)) {
- *object = static_cast<IAsyncOperation*>(this);
+ } else if (in_async_mode_ &&
+ IsEqualIID(iid, IID_IDataObjectAsyncCapability)) {
+ *object = static_cast<IDataObjectAsyncCapability*>(this);
} else {
*object = NULL;
return E_NOINTERFACE;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698