chrome/browser/media_galleries/linux/mtp_device_task_helper.cc - Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

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/media_galleries/linux/mtp_device_task_helper.cc

Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 8 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/media_galleries/linux/mtp_device_task_helper.cc

===================================================================

--- chrome/browser/media_galleries/linux/mtp_device_task_helper.cc (revision 193280)

+++ chrome/browser/media_galleries/linux/mtp_device_task_helper.cc (working copy)

@@ -8,6 +8,7 @@

#include "chrome/browser/media_galleries/linux/mtp_device_object_enumerator.h"

#include "chrome/browser/media_galleries/linux/mtp_read_file_worker.h"

#include "chrome/browser/media_galleries/linux/snapshot_file_details.h"

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

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

#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"

#include "third_party/cros_system_api/dbus/service_constants.h"

@@ -25,10 +26,7 @@

}

device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() {

- device::MediaTransferProtocolManager* mtp_device_mgr =

- device::MediaTransferProtocolManager::GetInstance();

- DCHECK(mtp_device_mgr);

- return mtp_device_mgr;

+ return StorageMonitor::GetInstance()->media_transfer_protocol_manager();

}

} // namespace

« no previous file with comments | « no previous file | chrome/browser/media_galleries/linux/mtp_read_file_worker.cc » ('j') | chrome/browser/storage_monitor/storage_monitor.h » ('J')