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 28e251884884b642d5020ced8f4a89f7c10af187..a6daed5db3f8e0e1c636b3b6d8be719bbe4ed85f 100644 |
--- a/chrome/browser/storage_monitor/image_capture_device_manager.mm |
+++ b/chrome/browser/storage_monitor/image_capture_device_manager.mm |
@@ -12,7 +12,7 @@ |
namespace { |
-chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
+ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
} // namespace |
@@ -31,10 +31,10 @@ chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
// Guaranteed to outlive this class. |
// TODO(gbillock): Update when ownership chains go up through |
// a StorageMonitor subclass. |
- chrome::StorageMonitor::Receiver* notifications_; |
+ StorageMonitor::Receiver* notifications_; |
} |
-- (void)setNotifications:(chrome::StorageMonitor::Receiver*)notifications; |
+- (void)setNotifications:(StorageMonitor::Receiver*)notifications; |
- (void)close; |
// The UUIDs passed here are available in the device attach notifications. |
@@ -59,7 +59,7 @@ chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
return self; |
} |
-- (void)setNotifications:(chrome::StorageMonitor::Receiver*)notifications { |
+- (void)setNotifications:(StorageMonitor::Receiver*)notifications { |
notifications_ = notifications; |
} |
@@ -98,9 +98,9 @@ chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
[cameras_ addObject:addedDevice]; |
// TODO(gbillock): use [cameraDevice mountPoint] here when possible. |
- chrome::StorageInfo info( |
- chrome::StorageInfo::MakeDeviceId( |
- chrome::StorageInfo::MAC_IMAGE_CAPTURE, |
+ StorageInfo info( |
+ StorageInfo::MakeDeviceId( |
+ StorageInfo::MAC_IMAGE_CAPTURE, |
base::SysNSStringToUTF8([cameraDevice UUIDString])), |
base::SysNSStringToUTF16([cameraDevice name]), |
"", |
@@ -123,14 +123,11 @@ chrome::ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
[cameras_ removeObject:device]; |
notifications_->ProcessDetach( |
- chrome::StorageInfo::MakeDeviceId( |
- chrome::StorageInfo::MAC_IMAGE_CAPTURE, uuid)); |
+ StorageInfo::MakeDeviceId(StorageInfo::MAC_IMAGE_CAPTURE, uuid)); |
} |
@end // ImageCaptureDeviceManagerImpl |
-namespace chrome { |
- |
ImageCaptureDeviceManager::ImageCaptureDeviceManager() { |
device_browser_.reset([[ImageCaptureDeviceManagerImpl alloc] init]); |
g_image_capture_device_manager = this; |
@@ -167,5 +164,3 @@ ImageCaptureDevice* ImageCaptureDeviceManager::deviceForUUID( |
id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() { |
return device_browser_.get(); |
} |
- |
-} // namespace chrome |