| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/storage_monitor/image_capture_device_manager.h" | 5 #include "chrome/browser/storage_monitor/image_capture_device_manager.h" |
| 6 | 6 |
| 7 #import <ImageCaptureCore/ImageCaptureCore.h> | 7 #import <ImageCaptureCore/ImageCaptureCore.h> |
| 8 | 8 |
| 9 #import "chrome/browser/storage_monitor/image_capture_device.h" | 9 #import "chrome/browser/storage_monitor/image_capture_device.h" |
| 10 #include "chrome/browser/storage_monitor/storage_info.h" | 10 #include "chrome/browser/storage_monitor/storage_info.h" |
| 11 #include "content/public/browser/browser_thread.h" | |
| 12 | 11 |
| 13 namespace { | 12 namespace { |
| 14 | 13 |
| 15 ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; | 14 ImageCaptureDeviceManager* g_image_capture_device_manager = NULL; |
| 16 | 15 |
| 17 } // namespace | 16 } // namespace |
| 18 | 17 |
| 19 // This class is the surface for the Mac ICDeviceBrowser ImageCaptureCore API. | 18 // This class is the surface for the Mac ICDeviceBrowser ImageCaptureCore API. |
| 20 // Owned by the ChromeBrowserParts and has browser process lifetime. Upon | 19 // Owned by the ChromeBrowserParts and has browser process lifetime. Upon |
| 21 // creation, it gets a list of attached media volumes (asynchronously) which | 20 // creation, it gets a list of attached media volumes (asynchronously) which |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 ImageCaptureDevice* ImageCaptureDeviceManager::deviceForUUID( | 156 ImageCaptureDevice* ImageCaptureDeviceManager::deviceForUUID( |
| 158 const std::string& uuid) { | 157 const std::string& uuid) { |
| 159 ImageCaptureDeviceManagerImpl* manager = | 158 ImageCaptureDeviceManagerImpl* manager = |
| 160 g_image_capture_device_manager->device_browser_; | 159 g_image_capture_device_manager->device_browser_; |
| 161 return [manager deviceForUUID:uuid]; | 160 return [manager deviceForUUID:uuid]; |
| 162 } | 161 } |
| 163 | 162 |
| 164 id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() { | 163 id<ICDeviceBrowserDelegate> ImageCaptureDeviceManager::device_browser() { |
| 165 return device_browser_.get(); | 164 return device_browser_.get(); |
| 166 } | 165 } |
| OLD | NEW |