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

Unified Diff: chrome/browser/media_galleries/win/mtp_device_operations_util.cc

Issue 2870263002: Rename ScopedComPtr::Receive to ScopedComPtr::GetAddressOf (Closed)
Patch Set: Rebase to 2a6f440 Created 3 years, 7 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: chrome/browser/media_galleries/win/mtp_device_operations_util.cc
diff --git a/chrome/browser/media_galleries/win/mtp_device_operations_util.cc b/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
index 2bc9cd8d0b3d0a87b959a453ba2d52c2dbd29883..893a64609d7d7cc545a041a40ab740ef044bd7c9 100644
--- a/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
@@ -59,7 +59,7 @@ base::win::ScopedComPtr<IPortableDeviceContent> GetDeviceContent(
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(device);
base::win::ScopedComPtr<IPortableDeviceContent> content;
- if (SUCCEEDED(device->Content(content.Receive())))
+ if (SUCCEEDED(device->Content(content.GetAddressOf())))
return content;
return base::win::ScopedComPtr<IPortableDeviceContent>();
}
@@ -80,7 +80,7 @@ base::win::ScopedComPtr<IEnumPortableDeviceObjectIDs> GetDeviceObjectEnumerator(
base::win::ScopedComPtr<IEnumPortableDeviceObjectIDs> enum_object_ids;
if (SUCCEEDED(content->EnumObjects(0, parent_id.c_str(), NULL,
- enum_object_ids.Receive())))
+ enum_object_ids.GetAddressOf())))
return enum_object_ids;
return base::win::ScopedComPtr<IEnumPortableDeviceObjectIDs>();
}
@@ -186,7 +186,7 @@ bool GetObjectDetails(IPortableDevice* device,
return false;
base::win::ScopedComPtr<IPortableDeviceProperties> properties;
- HRESULT hr = content->Properties(properties.Receive());
+ HRESULT hr = content->Properties(properties.GetAddressOf());
if (FAILED(hr))
return false;
@@ -207,9 +207,8 @@ bool GetObjectDetails(IPortableDevice* device,
return false;
base::win::ScopedComPtr<IPortableDeviceValues> properties_values;
- hr = properties->GetValues(object_id.c_str(),
- properties_to_read.Get(),
- properties_values.Receive());
+ hr = properties->GetValues(object_id.c_str(), properties_to_read.Get(),
+ properties_values.GetAddressOf());
if (FAILED(hr))
return false;
@@ -364,7 +363,7 @@ HRESULT GetFileStreamForObject(IPortableDevice* device,
return E_FAIL;
base::win::ScopedComPtr<IPortableDeviceResources> resources;
- HRESULT hr = content->Transfer(resources.Receive());
+ HRESULT hr = content->Transfer(resources.GetAddressOf());
if (FAILED(hr))
return hr;
return resources->GetStream(file_object_id.c_str(), WPD_RESOURCE_DEFAULT,

Powered by Google App Engine
This is Rietveld 408576698