chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h - Issue 14247034: Move Media Galleries FileAPI code out of webkit.

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_delegate_impl_linux.h

Issue 14247034: Move Media Galleries FileAPI code out of webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cr-14352004

Patch Set: Add android ifdef. 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/fileapi/picasa/pmp_test_helper.cc ('k') | chrome/browser/media_galleries/linux/mtp_device_task_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

index 01bc9d168c1d06b8349b6a2c2909015cd8a2c09e..7483b178e2c5cd3a2783a994d23889a8c50129cc 100644

--- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

+++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

@@ -12,9 +12,9 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/platform_file.h"

+#include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"

#include "chrome/browser/media_galleries/mtp_device_delegate_impl.h"

#include "webkit/fileapi/async_file_util.h"

-#include "webkit/fileapi/media/mtp_device_async_delegate.h"

namespace base {

class FilePath;

@@ -30,7 +30,7 @@ struct SnapshotRequestInfo;

// MTPDeviceDelegateImplLinux lives on the IO thread.

// MTPDeviceDelegateImplLinux does a call-and-reply to the UI thread

// to dispatch the requests to MediaTransferProtocolManager.

-class MTPDeviceDelegateImplLinux : public fileapi::MTPDeviceAsyncDelegate {

+class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {

private:

friend void CreateMTPDeviceAsyncDelegate(

const std::string&,