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

Unified Diff: device/media_transfer_protocol/media_transfer_protocol_manager.cc

Issue 11744030: Try 2 [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed gyp dependencies. 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
Index: device/media_transfer_protocol/media_transfer_protocol_manager.cc
diff --git a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
similarity index 97%
rename from chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc
rename to device/media_transfer_protocol/media_transfer_protocol_manager.cc
index dbb246fb9153d48ffbca4e75b1f5507b1a5654b6..dba7d184328447b77256732ae8add753de3a4e92 100644
--- a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
#include <map>
#include <queue>
@@ -14,11 +14,11 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/stl_util.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
-#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_storage_info.pb.h"
#if defined(OS_CHROMEOS)
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -28,7 +28,7 @@
using content::BrowserThread;
-namespace chrome {
+namespace device {
namespace {
@@ -391,7 +391,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
}
// Mtpd DBus client.
- scoped_ptr<chrome::MediaTransferProtocolDaemonClient> mtp_client_;
+ scoped_ptr<MediaTransferProtocolDaemonClient> mtp_client_;
#if !defined(OS_CHROMEOS)
// And a D-Bus session for talking to mtpd.
@@ -450,4 +450,4 @@ MediaTransferProtocolManager* MediaTransferProtocolManager::GetInstance() {
return g_media_transfer_protocol_manager;
}
-} // namespace chrome
+} // namespace device

Powered by Google App Engine
This is Rietveld 408576698