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

Unified Diff: chrome/browser/storage_monitor/storage_monitor_mac.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 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 | « chrome/browser/storage_monitor/storage_monitor_mac.h ('k') | chrome/browser/ui/cocoa/animatable_image.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/storage_monitor/storage_monitor_mac.mm
diff --git a/chrome/browser/storage_monitor/storage_monitor_mac.mm b/chrome/browser/storage_monitor/storage_monitor_mac.mm
index 9c5ca638c7fe805af9bc70a3a3e3608eb83c4213..346f9589034011cdc6627d9f178e0c653ec78aa6 100644
--- a/chrome/browser/storage_monitor/storage_monitor_mac.mm
+++ b/chrome/browser/storage_monitor/storage_monitor_mac.mm
@@ -74,7 +74,7 @@ StorageInfo BuildStorageInfo(
dict, kDADiskDescriptionVolumeUUIDKey);
std::string unique_id;
if (uuid) {
- base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
+ base::ScopedCFTypeRef<CFStringRef> uuid_string(
CFUUIDCreateString(NULL, uuid));
if (uuid_string.get())
unique_id = base::SysCFStringRefToUTF8(uuid_string);
@@ -105,7 +105,7 @@ StorageInfo BuildStorageInfo(
void GetDiskInfoAndUpdateOnFileThread(
const base::WeakPtr<StorageMonitorMac>& monitor,
- base::mac::ScopedCFTypeRef<CFDictionaryRef> dict,
+ base::ScopedCFTypeRef<CFDictionaryRef> dict,
StorageMonitorMac::UpdateType update_type) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
@@ -125,7 +125,7 @@ void GetDiskInfoAndUpdateOnFileThread(
struct EjectDiskOptions {
std::string bsd_name;
base::Callback<void(StorageMonitor::EjectStatus)> callback;
- base::mac::ScopedCFTypeRef<DADiskRef> disk;
+ base::ScopedCFTypeRef<DADiskRef> disk;
};
void PostEjectCallback(DADiskRef disk,
@@ -289,7 +289,7 @@ void StorageMonitorMac::EjectDevice(
receiver()->ProcessDetach(device_id);
- base::mac::ScopedCFTypeRef<DADiskRef> disk(
+ base::ScopedCFTypeRef<DADiskRef> disk(
DADiskCreateFromBSDName(NULL, session_, bsd_name.c_str()));
if (!disk.get()) {
callback.Run(StorageMonitor::EJECT_FAILURE);
@@ -337,7 +337,7 @@ void StorageMonitorMac::GetDiskInfoAndUpdate(
pending_disk_updates_++;
- base::mac::ScopedCFTypeRef<CFDictionaryRef> dict(DADiskCopyDescription(disk));
+ base::ScopedCFTypeRef<CFDictionaryRef> dict(DADiskCopyDescription(disk));
content::BrowserThread::PostTask(
content::BrowserThread::FILE,
FROM_HERE,
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_mac.h ('k') | chrome/browser/ui/cocoa/animatable_image.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698