summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_mac.mm
diff options
context:
space:
mode:
authorgbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 00:15:19 +0000
committergbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 00:15:19 +0000
commitc43a0d65861efed2d4e80342e045cae91343be49 (patch)
tree0c33d007484fe5cc3cd17214e8b2b06f906f5afd /chrome/browser/chrome_browser_main_mac.mm
parent69450a09061d300a3317e3762092155d543ad2ac (diff)
downloadchromium_src-c43a0d65861efed2d4e80342e045cae91343be49.zip
chromium_src-c43a0d65861efed2d4e80342e045cae91343be49.tar.gz
chromium_src-c43a0d65861efed2d4e80342e045cae91343be49.tar.bz2
[Media Galleries] Add an ImageCaptureCore listener for Mac. (part 2)
This listener uses the ImageCapture API to watch for attach and detach events of PTP devices and other devices which can be read through the library. It forwards such notifications through the SystemMonitor. Also provides an API for clients to access such devices directly and retrieve the media contents from them. R=thestig@chromium.org,sail@chromium.org BUG=151681 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175471 Review URL: https://chromiumcodereview.appspot.com/11442057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_mac.mm')
-rw-r--r--chrome/browser/chrome_browser_main_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index fc4bb44..27658c0 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -22,6 +22,7 @@
#include "chrome/browser/mac/keychain_reauthorize.h"
#import "chrome/browser/mac/keystone_glue.h"
#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/system_monitor/image_capture_device_manager.h"
#include "chrome/browser/system_monitor/removable_device_notifications_mac.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -283,6 +284,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
void ChromeBrowserMainPartsMac::PreProfileInit() {
removable_device_notifications_mac_ =
new chrome::RemovableDeviceNotificationsMac();
+ image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager);
ChromeBrowserMainPartsPosix::PreProfileInit();
}