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 9130e2e7e5985ffc6ceae18d64b788a0949a3fd5..c50f7483d0bfa6032c280adec910074636f64a58 100644 |
--- a/chrome/browser/chrome_browser_main_mac.mm |
+++ b/chrome/browser/chrome_browser_main_mac.mm |
@@ -22,7 +22,6 @@ |
#include "chrome/browser/mac/keychain_reauthorize.h" |
#import "chrome/browser/mac/keystone_glue.h" |
#include "chrome/browser/metrics/metrics_service.h" |
-#include "chrome/browser/storage_monitor/image_capture_device_manager.h" |
#include "chrome/browser/storage_monitor/removable_device_notifications_mac.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -284,17 +283,16 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() { |
void ChromeBrowserMainPartsMac::PreProfileInit() { |
removable_device_notifications_mac_ = |
new chrome::RemovableDeviceNotificationsMac(); |
- // TODO(gbillock): Make the ImageCapture manager owned by |
- // RemovableDeviceNotificationsMac. |
- if (base::mac::IsOSLionOrLater()) { |
- image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager); |
- image_capture_device_manager_->SetNotifications( |
- removable_device_notifications_mac_->receiver()); |
- } |
ChromeBrowserMainPartsPosix::PreProfileInit(); |
} |
+void ChromeBrowserMainPartsMac::PostProfileInit() { |
Lei Zhang
2013/03/01 04:40:15
This didn't get added to the header.
Greg Billock
2013/03/01 18:00:50
Done.
|
+ removable_device_notifications_mac_->Init(); |
+ |
+ ChromeBrowserMainPartsPosix::PostProfileInit(); |
+} |
+ |
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
AppController* appController = [NSApp delegate]; |
[appController didEndMainMessageLoop]; |