chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc - Issue 11744014: [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device.

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_gallery/linux/mtp_device_operations_utils.cc

Issue 11744014: [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix gclient runhooks error Created 7 years, 12 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_gallery/linux/mtp_device_operations_utils.h ('k') | chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc

diff --git a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc

index c92dda0bcd77d28f8fa88eef43177d35765ca101..2a412bc59912d35642f4336dbee3c45ca073b489 100644

--- a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc

+++ b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc

@@ -4,14 +4,14 @@

#include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h"

-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"

+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"

namespace chrome {

// Returns MediaTransferProtocolManager instance on success or NULL on failure.

-MediaTransferProtocolManager* GetMediaTransferProtocolManager() {

- MediaTransferProtocolManager* mtp_device_mgr =

- MediaTransferProtocolManager::GetInstance();

+device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() {

+ device::MediaTransferProtocolManager* mtp_device_mgr =

+ device::MediaTransferProtocolManager::GetInstance();

DCHECK(mtp_device_mgr);

return mtp_device_mgr;

}