chrome/browser/media_galleries/linux/mtp_read_file_worker.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_read_file_worker.cc

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

Patch Set: fix browser_tests 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

« no previous file with comments | « chrome/browser/media_galleries/linux/mtp_device_task_helper.cc ('k') | chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/linux/mtp_read_file_worker.cc

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

--- chrome/browser/media_galleries/linux/mtp_read_file_worker.cc (revision 194743)

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

@@ -9,6 +9,7 @@

#include "base/files/file_path.h"

#include "base/safe_numerics.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"

@@ -64,9 +65,9 @@

// |snapshot_file_details| in the same_line.

SnapshotFileDetails* snapshot_file_details_ptr = snapshot_file_details.get();

- device::MediaTransferProtocolManager* mtp_device_mgr =

- device::MediaTransferProtocolManager::GetInstance();

- mtp_device_mgr->ReadFileChunkByPath(

+ device::MediaTransferProtocolManager* mtp_device_manager =

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

+ mtp_device_manager->ReadFileChunkByPath(

device_handle_,

snapshot_file_details_ptr->device_file_path(),

snapshot_file_details_ptr->bytes_written(),