chrome/browser/storage_monitor/removable_device_notifications_mac.mm - Issue 12334096: Regularize ownerships and lifecycle for storage monitor platform classes.

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/storage_monitor/removable_device_notifications_mac.mm

Issue 12334096: Regularize ownerships and lifecycle for storage monitor platform classes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: in progress... changed to not require mtp manager in linux for tests. 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

« chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc ('K') | « chrome/browser/storage_monitor/removable_device_notifications_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/removable_device_notifications_mac.mm

diff --git a/chrome/browser/storage_monitor/removable_device_notifications_mac.mm b/chrome/browser/storage_monitor/removable_device_notifications_mac.mm

index 16480b0c3bfd2371e40cf1de59fe52c6c43c59d8..d743fa944bf7fd629dfee37903717c117c8e5c34 100644

--- a/chrome/browser/storage_monitor/removable_device_notifications_mac.mm

+++ b/chrome/browser/storage_monitor/removable_device_notifications_mac.mm

@@ -4,6 +4,8 @@

#include "chrome/browser/storage_monitor/removable_device_notifications_mac.h"

+#include "base/mac/mac_util.h"

+#include "chrome/browser/storage_monitor/image_capture_device_manager.h"

#include "chrome/browser/storage_monitor/media_device_notifications_utils.h"

#include "content/public/browser/browser_thread.h"

@@ -70,6 +72,11 @@ RemovableDeviceNotificationsMac::RemovableDeviceNotificationsMac() {

kDADiskDescriptionWatchVolumePath,

DiskDescriptionChangedCallback,

this);

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

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

+ image_capture_device_manager_->SetNotifications(receiver());

+ }

}

RemovableDeviceNotificationsMac::~RemovableDeviceNotificationsMac() {