[Media Galleries] Add an ImageCaptureCore listener for Mac. (part 2)

chrome/browser/system_monitor/image_capture_device_manager.mm

Index: chrome/browser/system_monitor/image_capture_device_manager.mm
diff --git a/chrome/browser/system_monitor/image_capture_device_manager.mm b/chrome/browser/system_monitor/image_capture_device_manager.mm
new file mode 100644
index 0000000000000000000000000000000000000000..fe676d394b27e4c6d5fe696ed3b0447bbb829cf0
--- /dev/null
+++ b/chrome/browser/system_monitor/image_capture_device_manager.mm
@@ -0,0 +1,137 @@
+// 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/image_capture_device_manager.h"
+
+#import <ImageCaptureCore/ImageCaptureCore.h>
+
+#include "base/file_util.h"
+#include "base/system_monitor/system_monitor.h"
+#include "chrome/browser/system_monitor/disk_info_mac.h"
+#import "chrome/browser/system_monitor/image_capture_device.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace {
+
+chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL;
+
+}  // namespace
+
+// This class is the surface for the Mac ICDeviceBrowser ImageCaptureCore API.
+// Owned by the ChromeBrowserParts and has browser process lifetime. Upon
+// creation, it gets a list of attached media volumes (asynchronously) which
+// it will eventually forward to the SystemMonitor as removable storage
+// notifications. It will also set up an ImageCaptureCore listener to be
+// told when new devices/volumes are discovered and existing ones are removed.
+@interface ImageCaptureDeviceManagerImpl
+    : NSObject<ICDeviceBrowserDelegate> {
+ @private
+  scoped_nsobject<ICDeviceBrowser> deviceBrowser_;
+  scoped_nsobject<NSMutableArray> cameras_;
+}
+
+- (void)close;
+
+// The UUIDs passed here are available in the device attach notifications
+// given through SystemMonitor. They're gotten by cracking the device ID
+// and taking the unique ID output.
+- (ImageCaptureDevice*)deviceForUUID:(const std::string&)uuid;
+
+@end
+
+@implementation ImageCaptureDeviceManagerImpl
+
+- (id)init {
+  if ((self = [super init])) {
+    cameras_.reset([[NSMutableArray alloc] init]);
+
+    deviceBrowser_.reset([[ICDeviceBrowser alloc] init]);
+    [deviceBrowser_ setDelegate:self];
+    [deviceBrowser_ setBrowsedDeviceTypeMask:
+        [deviceBrowser_ browsedDeviceTypeMask] |
+        ICDeviceTypeMaskCamera | ICDeviceLocationTypeMaskLocal];
+    [deviceBrowser_ start];
+  }
+  return self;
+}
+
+- (void)close {
+  [deviceBrowser_ setDelegate:nil];
+  [deviceBrowser_ stop];
+  deviceBrowser_.reset();
+  cameras_.reset();
+}
+
+- (ImageCaptureDevice*) deviceForUUID:(const std::string&)uuid {
+  for (ICCameraDevice* camera in cameras_.get()) {
+    NSString* camera_id = [camera UUIDString];
+    if (base::SysNSStringToUTF8(camera_id) == uuid) {
+      return [[[ImageCaptureDevice alloc]
+          initWithCameraDevice:camera] autorelease];
+    }
+  }
+  return nil;
+}
+
+- (void)deviceBrowser:(ICDeviceBrowser*)browser
+         didAddDevice:(ICDevice*)addedDevice
+           moreComing:(BOOL)moreComing {
+  if (!(addedDevice.type & ICDeviceTypeCamera))
+    return;
+
+  ICCameraDevice* cameraDevice =
+      base::mac::ObjCCastStrict<ICCameraDevice>(addedDevice);
+
+  [cameras_ addObject:addedDevice];
+
+  base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+      chrome::MediaStorageUtil::MakeDeviceId(
+          chrome::MediaStorageUtil::MAC_IMAGE_CAPTURE,
+          base::SysNSStringToUTF8([cameraDevice UUIDString])),
+      base::SysNSStringToUTF16([cameraDevice name]),
+      base::SysNSStringToUTF8([cameraDevice mountPoint]));
+}
+
+- (void)deviceBrowser:(ICDeviceBrowser*)browser
+      didRemoveDevice:(ICDevice*)device
+            moreGoing:(BOOL)moreGoing {
+  if (!(device.type & ICDeviceTypeCamera))
+    return;
+
+  [cameras_ removeObject:device];

[sail, 2013/01/03 21:50:28]

At this point device may be deleted. You can do something like this to make sure
it stays alive:
  scoped_nsobject<IDDevice> deviceKeepAlive([device retain]);

[Greg Billock, 2013/01/03 23:09:42]

I just need it to get the UUIDString. I'll do that above.

[sail, 2013/01/04 00:00:36]

Ok, looks good.

+
+  base::SystemMonitor::Get()->ProcessRemovableStorageDetached(
+      chrome::MediaStorageUtil::MakeDeviceId(
+          chrome::MediaStorageUtil::MAC_IMAGE_CAPTURE,
+          base::SysNSStringToUTF8([device UUIDString])));
+}
+
+@end  // ImageCaptureDeviceManagerImpl
+
+namespace chrome {
+
+ImageCaptureDeviceManager::ImageCaptureDeviceManager() {
+  device_browser_.reset([[ImageCaptureDeviceManagerImpl alloc] init]);
+  g_image_capture_device_manager = this;
+}
+
+ImageCaptureDeviceManager::~ImageCaptureDeviceManager() {
+  g_image_capture_device_manager = NULL;
+  [device_browser_ close];
+}
+
+// static
+ImageCaptureDevice* ImageCaptureDeviceManager::deviceForUUID(
+    const std::string& uuid) {
+  ImageCaptureDeviceManagerImpl* manager =
+      g_image_capture_device_manager->device_browser_;
+  return [manager deviceForUUID:uuid];
+}
+
+id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() {
+  return device_browser_.get();
+}
+
+}  // namespace chrome