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

Side by Side Diff: components/storage_monitor/image_capture_device_manager.mm

Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unittest build error on mac/linux/chromeos Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/storage_monitor/image_capture_device_manager.h" 5 #include "components/storage_monitor/image_capture_device_manager.h"
6 6
7 #import <ImageCaptureCore/ImageCaptureCore.h> 7 #import <ImageCaptureCore/ImageCaptureCore.h>
8 8
9 #import "components/storage_monitor/image_capture_device.h" 9 #import "components/storage_monitor/image_capture_device.h"
10 #include "components/storage_monitor/storage_info.h" 10 #include "components/storage_monitor/storage_info.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ICCameraDevice* cameraDevice = 97 ICCameraDevice* cameraDevice =
98 base::mac::ObjCCastStrict<ICCameraDevice>(addedDevice); 98 base::mac::ObjCCastStrict<ICCameraDevice>(addedDevice);
99 99
100 [cameras_ addObject:addedDevice]; 100 [cameras_ addObject:addedDevice];
101 101
102 // TODO(gbillock): use [cameraDevice mountPoint] here when possible. 102 // TODO(gbillock): use [cameraDevice mountPoint] here when possible.
103 storage_monitor::StorageInfo info( 103 storage_monitor::StorageInfo info(
104 storage_monitor::StorageInfo::MakeDeviceId( 104 storage_monitor::StorageInfo::MakeDeviceId(
105 storage_monitor::StorageInfo::MAC_IMAGE_CAPTURE, 105 storage_monitor::StorageInfo::MAC_IMAGE_CAPTURE,
106 base::SysNSStringToUTF8([cameraDevice UUIDString])), 106 base::SysNSStringToUTF8([cameraDevice UUIDString])),
107 base::SysNSStringToUTF16([cameraDevice name]), 107 std::string(),
108 "",
109 base::SysNSStringToUTF16([cameraDevice name]), 108 base::SysNSStringToUTF16([cameraDevice name]),
110 base::string16(), 109 base::string16(),
111 base::string16(), 110 base::string16(),
112 0); 111 0);
113 notifications_->ProcessAttach(info); 112 notifications_->ProcessAttach(info);
114 } 113 }
115 114
116 - (void)deviceBrowser:(ICDeviceBrowser*)browser 115 - (void)deviceBrowser:(ICDeviceBrowser*)browser
117 didRemoveDevice:(ICDevice*)device 116 didRemoveDevice:(ICDevice*)device
118 moreGoing:(BOOL)moreGoing { 117 moreGoing:(BOOL)moreGoing {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 ImageCaptureDeviceManagerImpl* manager = 162 ImageCaptureDeviceManagerImpl* manager =
164 g_image_capture_device_manager->device_browser_; 163 g_image_capture_device_manager->device_browser_;
165 return [manager deviceForUUID:uuid]; 164 return [manager deviceForUUID:uuid];
166 } 165 }
167 166
168 id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() { 167 id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() {
169 return device_browser_.get(); 168 return device_browser_.get();
170 } 169 }
171 170
172 } // namespace storage_monitor 171 } // namespace storage_monitor
OLDNEW
« no previous file with comments | « components/storage_monitor/DEPS ('k') | components/storage_monitor/media_storage_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698