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

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

Issue 13077003: [Media Galleries] Ignore Mac PTP volumes mounted with mass storage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/storage_monitor/image_capture_device_manager.mm
diff --git a/chrome/browser/storage_monitor/image_capture_device_manager.mm b/chrome/browser/storage_monitor/image_capture_device_manager.mm
index ae8f907fed69f1ec62d7c6beb8d9f5a09a61f9ff..80aca5a9cefd9462cd1269d70cd4009902ff5a0e 100644
--- a/chrome/browser/storage_monitor/image_capture_device_manager.mm
+++ b/chrome/browser/storage_monitor/image_capture_device_manager.mm
@@ -89,6 +89,11 @@ chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL;
if (!(addedDevice.type & ICDeviceTypeCamera))
return;
+ // Ignore mass storage attaches -- those will be handled
+ // by Mac's removable storage watcher.
+ if ([addedDevice.transportType isEqualToString:ICTransportTypeMassStorage])
+ return;
+
ICCameraDevice* cameraDevice =
base::mac::ObjCCastStrict<ICCameraDevice>(addedDevice);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698