| 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..d60bd1537089ea294c51169e5eabdce9af9ce939 100644
|
| --- a/chrome/browser/chrome_browser_main_mac.mm
|
| +++ b/chrome/browser/chrome_browser_main_mac.mm
|
| @@ -23,6 +23,7 @@
|
| #import "chrome/browser/mac/keystone_glue.h"
|
| #include "chrome/browser/metrics/metrics_service.h"
|
| #include "chrome/browser/system_monitor/removable_device_notifications_mac.h"
|
| +#include "chrome/browser/system_monitor/image_capture_device_browser_mac.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/common/main_function_params.h"
|
| @@ -175,6 +176,23 @@ ChromeBrowserMainPartsMac::ChromeBrowserMainPartsMac(
|
| ChromeBrowserMainPartsMac::~ChromeBrowserMainPartsMac() {
|
| }
|
|
|
| +class ChromeBrowserMainPartsMac::Inner {
|
| + public:
|
| + Inner();
|
| + ~Inner();
|
| +
|
| + scoped_nsobject<ImageCaptureDeviceBrowserMac> image_capture_device_browser_;
|
| +};
|
| +
|
| +ChromeBrowserMainPartsMac::Inner::Inner() {
|
| + image_capture_device_browser_.reset(
|
| + [[ImageCaptureDeviceBrowserMac alloc] init]);
|
| +}
|
| +
|
| +ChromeBrowserMainPartsMac::Inner::~Inner() {
|
| + [image_capture_device_browser_ close];
|
| +}
|
| +
|
| void ChromeBrowserMainPartsMac::PreEarlyInitialization() {
|
| if (parsed_command_line().HasSwitch(switches::kKeychainReauthorize)) {
|
| if (base::mac::AmIBundled()) {
|
| @@ -283,6 +301,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
|
| void ChromeBrowserMainPartsMac::PreProfileInit() {
|
| removable_device_notifications_mac_ =
|
| new chrome::RemovableDeviceNotificationsMac();
|
| + inner_.reset(new Inner);
|
| ChromeBrowserMainPartsPosix::PreProfileInit();
|
| }
|
|
|
|
|