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

Unified Diff: chrome/browser/media_galleries/fileapi/mtp_device_map_service.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/fileapi/mtp_device_map_service.cc
diff --git a/webkit/fileapi/media/mtp_device_map_service.cc b/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
similarity index 87%
rename from webkit/fileapi/media/mtp_device_map_service.cc
rename to chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
index a4c4bea0a7c0231ee8186d6034dddb43b6fb6caf..96c5b85f1e71f023139d8dd9801be006ecc8aa08 100644
--- a/webkit/fileapi/media/mtp_device_map_service.cc
+++ b/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/fileapi/media/mtp_device_map_service.h"
+#include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
#include <string>
#include <utility>
#include "base/stl_util.h"
+#include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"
#include "webkit/fileapi/isolated_context.h"
-#include "webkit/fileapi/media/mtp_device_async_delegate.h"
-namespace fileapi {
+namespace chrome {
namespace {
@@ -52,8 +52,8 @@ MTPDeviceAsyncDelegate* MTPDeviceMapService::GetMTPDeviceAsyncDelegate(
const std::string& filesystem_id) {
DCHECK(thread_checker_.CalledOnValidThread());
base::FilePath device_path;
- if (!IsolatedContext::GetInstance()->GetRegisteredPath(filesystem_id,
- &device_path)) {
+ if (!fileapi::IsolatedContext::GetInstance()->GetRegisteredPath(
+ filesystem_id, &device_path)) {
return NULL;
}
@@ -70,4 +70,4 @@ MTPDeviceMapService::MTPDeviceMapService() {
MTPDeviceMapService::~MTPDeviceMapService() {}
-} // namespace fileapi
+} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698