Implement RemovableDeviceNotifications for Mac

chrome/browser/system_monitor/disk_info_mac.mm

Index: chrome/browser/system_monitor/disk_info_mac.mm
diff --git a/chrome/browser/system_monitor/disk_info_mac.mm b/chrome/browser/system_monitor/disk_info_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..41da6d20c1c06b19dfd7c64ae45d2d9d7a8607af
--- /dev/null
+++ b/chrome/browser/system_monitor/disk_info_mac.mm
@@ -0,0 +1,100 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/system_monitor/disk_info_mac.h"
+
+#include "base/mac/foundation_util.h"
+#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace chrome {
+namespace {
+
+string16 GetUTF16FromDictionary(CFDictionaryRef dictionary, CFStringRef key) {
+  CFStringRef value =
+      base::mac::GetValueFromDictionary<CFStringRef>(dictionary, key);
+  return base::SysCFStringRefToUTF16(value);
+}
+
+string16 JoinName(const string16& name, const string16& addition) {
+  if (addition.empty())
+    return name;
+  if (name.empty())
+    return addition;
+  return name + ASCIIToUTF16(" ") + addition;

[Mark Mentovai, 2012/09/12 21:12:43]

Can’t you just say |name + ' ' + addition| here and avoid calling the convertor
for a constant character?

[sail, 2012/09/12 22:38:26]

Unfortunately not since this is string16.

[Mark Mentovai, 2012/09/12 22:45:26]

So what? I’m talking about a char16, not a string16. Single quotes. ' ' (or 32,
if you prefer) is a space is a space, regardless of width: char, char16,
wchar_t. You can cast it to char16 if you have to or want to.

[sail, 2012/09/12 22:50:26]

Done.

+}
+
+MediaStorageUtil::Type GetDeviceType(bool is_removable, bool has_dcim) {
+  if (!is_removable)
+    return MediaStorageUtil::FIXED_MASS_STORAGE;
+  if (has_dcim)
+    return MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM;
+  return MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
+}
+
+}  // namespace
+
+DiskInfoMac::DiskInfoMac() {
+}
+
+DiskInfoMac::~DiskInfoMac() {
+}
+
+// static
+DiskInfoMac DiskInfoMac::BuildDiskInfoOnFileThread(CFDictionaryRef dict) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DiskInfoMac info;
+
+  CFStringRef bsd_name = base::mac::GetValueFromDictionary<CFStringRef>(
+      dict, kDADiskDescriptionMediaBSDNameKey);
+  info.bsd_name_ = base::SysCFStringRefToUTF8(bsd_name);
+
+  CFURLRef url = base::mac::GetValueFromDictionary<CFURLRef>(
+      dict, kDADiskDescriptionVolumePathKey);
+  NSURL* nsurl = base::mac::CFToNSCast(url);
+  info.mount_point_ = base::mac::NSStringToFilePath([nsurl path]);
+
+  string16 vendor_name = GetUTF16FromDictionary(
+      dict, kDADiskDescriptionDeviceVendorKey);
+  string16 model_name = GetUTF16FromDictionary(
+      dict, kDADiskDescriptionDeviceModelKey);
+  string16 volume_name = GetUTF16FromDictionary(
+      dict, kDADiskDescriptionVolumeNameKey);
+  info.display_name_ = vendor_name;
+  info.display_name_ = JoinName(info.display_name_, model_name);
+  info.display_name_ = JoinName(info.display_name_, volume_name);
+
+  CFUUIDRef uuid = base::mac::GetValueFromDictionary<CFUUIDRef>(
+      dict, kDADiskDescriptionVolumeUUIDKey);
+  std::string unique_id;
+  if (uuid) {
+    base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
+        CFUUIDCreateString(NULL, uuid));
+    unique_id = base::SysCFStringRefToUTF8(uuid_string);
+  }
+  if (unique_id.empty()) {
+    string16 revision = GetUTF16FromDictionary(
+        dict, kDADiskDescriptionDeviceRevisionKey);
+    string16 unique_id2 = vendor_name;
+    unique_id2 = JoinName(unique_id2, model_name);
+    unique_id2 = JoinName(unique_id2, revision);
+    unique_id = UTF16ToUTF8(unique_id2);
+  }
+
+  CFBooleanRef is_removable_ref =
+      base::mac::GetValueFromDictionary<CFBooleanRef>(
+          dict, kDADiskDescriptionMediaRemovableKey);
+  bool is_removable = is_removable_ref && CFBooleanGetValue(is_removable_ref);
+  // Checking for DCIM only matters on removable devices.
+  bool has_dcim = is_removable && IsMediaDevice(info.mount_point_.value());
+  info.type_ = GetDeviceType(is_removable, has_dcim);
+  info.device_id_ = MediaStorageUtil::MakeDeviceId(info.type_, unique_id);
+
+  return info;
+}
+
+}  // chrome

[Mark Mentovai, 2012/09/12 21:12:43]

// namespace chrome

[sail, 2012/09/12 22:38:26]

Done.