Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4426)

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 12147002: Add a receiver interface to RemovableStorageNotifications. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merging Created 7 years, 10 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:
View side-by-side diff with in-line comments
Download patch
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 07bc6c56309dedb6eefd7d42a1251860e19d6a6a..ebfb656d60c371b1eee4407a38ebe666db81dd66 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -284,8 +284,13 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
void ChromeBrowserMainPartsMac::PreProfileInit() {
removable_device_notifications_mac_ =
new chrome::RemovableDeviceNotificationsMac();
- if (base::mac::IsOSLionOrLater())
+ // 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();
}

Powered by Google App Engine
This is Rietveld 408576698