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 31613dac8de6bb20a280151086843ce2c1d86aeb..cd32ec47dd20d2e0096196d5408c99536f2aa5b5 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/storage_monitor_mac.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -283,16 +282,16 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() { |
void ChromeBrowserMainPartsMac::PreProfileInit() { |
storage_monitor_ = new chrome::StorageMonitorMac(); |
- // TODO(gbillock): Make the ImageCapture manager owned by StorageMonitorMac. |
- if (base::mac::IsOSLionOrLater()) { |
- image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager); |
- image_capture_device_manager_->SetNotifications( |
- storage_monitor_->receiver()); |
- } |
ChromeBrowserMainPartsPosix::PreProfileInit(); |
} |
+void ChromeBrowserMainPartsMac::PostProfileInit() { |
+ storage_monitor_->Init(); |
+ |
+ ChromeBrowserMainPartsPosix::PostProfileInit(); |
+} |
+ |
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
AppController* appController = [NSApp delegate]; |
[appController didEndMainMessageLoop]; |