chrome/browser/chrome_browser_main_mac.mm - Issue 11442057: [Media Galleries] Add an ImageCaptureCore listener for Mac. (part 2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 11442057: [Media Galleries] Add an ImageCaptureCore listener for Mac. (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Don't use second cast Created 7 years, 11 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:

Index: chrome/browser/chrome_browser_main_mac.mm

diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm

index fc4bb446014d02a6aa1b854c33f3cbdb3439d668..030ff23dc00e5d6fa6bf94422791678603e5f345 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,9 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {

void ChromeBrowserMainPartsMac::PreProfileInit() {

removable_device_notifications_mac_ =

new chrome::RemovableDeviceNotificationsMac();

+ if (base::mac::IsOSLionOrLater())

+ image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager);

ChromeBrowserMainPartsPosix::PreProfileInit();

}