Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1970)

Unified Diff: chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc

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
Index: chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc
diff --git a/chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc b/chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc
index b91d641012319d40ea83f99946f5f189c5769370..2444f0af6dd964c846a4f2ec475705226c828b4d 100644
--- a/chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc
+++ b/chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc
@@ -4,15 +4,16 @@
#include "chrome/browser/media_galleries/scoped_mtp_device_map_entry.h"
-#include "webkit/fileapi/media/mtp_device_file_system_config.h"
+#include "chrome/browser/media_galleries/fileapi/mtp_device_file_system_config.h"
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
#include "base/bind.h"
#include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
#include "chrome/browser/media_galleries/mtp_device_delegate_impl.h"
#include "content/public/browser/browser_thread.h"
#include "webkit/fileapi/file_system_task_runners.h"
-#include "webkit/fileapi/media/mtp_device_map_service.h"
+
#endif
namespace chrome {
@@ -37,7 +38,7 @@ scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() {
void OnDeviceAsyncDelegateDestroyed(
const base::FilePath::StringType& device_location) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- fileapi::MTPDeviceMapService::GetInstance()->RemoveAsyncDelegate(
+ MTPDeviceMapService::GetInstance()->RemoveAsyncDelegate(
device_location);
}
@@ -82,10 +83,10 @@ ScopedMTPDeviceMapEntry::~ScopedMTPDeviceMapEntry() {
}
void ScopedMTPDeviceMapEntry::OnMTPDeviceAsyncDelegateCreated(
- fileapi::MTPDeviceAsyncDelegate* delegate) {
+ MTPDeviceAsyncDelegate* delegate) {
#if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- fileapi::MTPDeviceMapService::GetInstance()->AddAsyncDelegate(
+ MTPDeviceMapService::GetInstance()->AddAsyncDelegate(
device_location_, delegate);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698