diff options
26 files changed, 104 insertions, 121 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 6b17612..219cd51 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -7,7 +7,6 @@ include_rules = [ "+content/components", "+content/public/browser", "+device/bluetooth", - "+device/media_transfer_protocol", "+extensions/common", "+google/cacheinvalidation", # Sync invalidation API protobuf files. "+google_apis", diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index 2bf9e3a..db40bec 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chrome_browser_main_linux.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" #if !defined(OS_CHROMEOS) #include "chrome/browser/system_monitor/removable_device_notifications_linux.h" @@ -82,7 +82,7 @@ ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() { if (did_pre_profile_init_) - device::MediaTransferProtocolManager::Shutdown(); + chrome::MediaTransferProtocolManager::Shutdown(); } void ChromeBrowserMainPartsLinux::PreProfileInit() { @@ -106,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { removable_device_notifications_linux_->Init(); #endif - device::MediaTransferProtocolManager::Initialize(); + chrome::MediaTransferProtocolManager::Initialize(); did_pre_profile_init_ = true; diff --git a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc index 6a5e2c1..38b6dff 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc +++ b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc @@ -16,8 +16,8 @@ #include "chrome/browser/media_gallery/linux/mtp_read_directory_worker.h" #include "chrome/browser/media_gallery/linux/mtp_read_file_worker.h" #include "chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" #include "content/public/browser/browser_thread.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" using base::Bind; using base::PlatformFileError; diff --git a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h index 340298ad..d7ea79a 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/time.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" #include "webkit/fileapi/file_system_file_util.h" namespace chrome { 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 2a412bc..c92dda0 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 "device/media_transfer_protocol/media_transfer_protocol_manager.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" namespace chrome { // Returns MediaTransferProtocolManager instance on success or NULL on failure. -device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() { - device::MediaTransferProtocolManager* mtp_device_mgr = - device::MediaTransferProtocolManager::GetInstance(); +MediaTransferProtocolManager* GetMediaTransferProtocolManager() { + MediaTransferProtocolManager* mtp_device_mgr = + MediaTransferProtocolManager::GetInstance(); DCHECK(mtp_device_mgr); return mtp_device_mgr; } diff --git a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h index f257dd1..2ba22cc 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h +++ b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h @@ -14,12 +14,10 @@ #include "base/sequenced_task_runner_helpers.h" #include "base/threading/sequenced_worker_pool.h" -namespace device { -class MediaTransferProtocolManager; -} - namespace chrome { +class MediaTransferProtocolManager; + // Helper struct to delete worker objects on |media_task_runner_| thread. template <typename WORKER> struct WorkerDeleter { static void Destruct(const WORKER* worker) { @@ -32,7 +30,7 @@ template <typename WORKER> struct WorkerDeleter { }; // Returns MediaTransferProtocolManager instance on success or NULL on failure. -device::MediaTransferProtocolManager* GetMediaTransferProtocolManager(); +MediaTransferProtocolManager* GetMediaTransferProtocolManager(); } // namespace chrome diff --git a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc index 0b1cd80..7115595 100644 --- a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc +++ b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" #include "content/public/browser/browser_thread.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" namespace chrome { diff --git a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h index b6303e70..7bafca7 100644 --- a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h +++ b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h @@ -10,7 +10,7 @@ #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/cancellation_flag.h" #include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc b/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc index 0d248b8..8dd0513 100644 --- a/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc +++ b/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" #include "content/public/browser/browser_thread.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace chrome { diff --git a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc index 44a3294..4e6e74b 100644 --- a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc +++ b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" #include "content/public/browser/browser_thread.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" namespace chrome { diff --git a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h index 9b1f2ee..9ae84da 100644 --- a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h +++ b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h @@ -12,7 +12,7 @@ #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/cancellation_flag.h" #include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc b/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc index bcefa33..7b1e9f0 100644 --- a/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc +++ b/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc @@ -12,9 +12,9 @@ #include "base/file_util.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" #include "content/public/browser/browser_thread.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" #include "third_party/cros_system_api/dbus/service_constants.h" using content::BrowserThread; diff --git a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h index 13b5910..9701d4d 100644 --- a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/time.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" #include "webkit/fileapi/file_system_file_util.h" namespace base { diff --git a/chrome/browser/media_transfer_protocol/DEPS b/chrome/browser/media_transfer_protocol/DEPS new file mode 100644 index 0000000..4e249e0 --- /dev/null +++ b/chrome/browser/media_transfer_protocol/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + # The media transfer protocol daemon uses D-Bus. + "+dbus", +] diff --git a/device/media_transfer_protocol/OWNERS b/chrome/browser/media_transfer_protocol/OWNERS index 8cada85..8cada85 100644 --- a/device/media_transfer_protocol/OWNERS +++ b/chrome/browser/media_transfer_protocol/OWNERS diff --git a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc b/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc index 52e8e63..c88df8a 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc +++ b/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h" #include "base/bind.h" #include "base/memory/weak_ptr.h" +#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h" +#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" #include "dbus/object_proxy.h" -#include "device/media_transfer_protocol/mtp_file_entry.pb.h" -#include "device/media_transfer_protocol/mtp_storage_info.pb.h" #include "third_party/cros_system_api/dbus/service_constants.h" -namespace device { +namespace chrome { namespace { @@ -486,4 +486,4 @@ MediaTransferProtocolDaemonClient::Create(dbus::Bus* bus, bool is_stub) { return new MediaTransferProtocolDaemonClientImpl(bus); } -} // namespace device +} // namespace chrome diff --git a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h b/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h index bba9794..6b27fdd 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h +++ b/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h @@ -6,8 +6,8 @@ // responsible for communicating with PTP / MTP capable devices like cameras // and smartphones. -#ifndef DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ -#define DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ +#ifndef CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ +#define CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ #include <string> #include <vector> @@ -27,7 +27,7 @@ namespace dbus { class Bus; } -namespace device { +namespace chrome { // A class to make the actual DBus calls for mtpd service. // This class only makes calls, result/error handling should be done @@ -175,6 +175,6 @@ class MediaTransferProtocolDaemonClient { DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDaemonClient); }; -} // namespace device +} // namespace chrome -#endif // DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ +#endif // CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_ diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc index dba7d18..dbb246f 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/chrome/browser/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 "device/media_transfer_protocol/media_transfer_protocol_manager.h" +#include "chrome/browser/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 device { +namespace chrome { namespace { @@ -391,7 +391,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { } // Mtpd DBus client. - scoped_ptr<MediaTransferProtocolDaemonClient> mtp_client_; + scoped_ptr<chrome::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 device +} // namespace chrome diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.h b/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h index 5c416b5..19247f4 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.h +++ b/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ -#define DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ +#ifndef CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ +#define CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ #include <string> #include <vector> @@ -18,7 +18,7 @@ class MtpFileEntry; class MtpStorageInfo; -namespace device { +namespace chrome { // This class handles the interaction with mtpd. // Other classes can add themselves as observers. @@ -138,6 +138,6 @@ class MediaTransferProtocolManager { static MediaTransferProtocolManager* GetInstance(); }; -} // namespace device +} // namespace chrome -#endif // DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ +#endif // CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_ diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc index 2c29771..f98455d 100644 --- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc +++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc @@ -9,9 +9,9 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h" #include "chrome/browser/system_monitor/media_storage_util.h" #include "chrome/browser/system_monitor/removable_device_constants.h" -#include "device/media_transfer_protocol/mtp_storage_info.pb.h" namespace chrome { @@ -101,8 +101,8 @@ void GetStorageInfo(const std::string& storage_name, string16* label, std::string* location) { DCHECK(!storage_name.empty()); - device::MediaTransferProtocolManager* mtp_manager = - device::MediaTransferProtocolManager::GetInstance(); + MediaTransferProtocolManager* mtp_manager = + MediaTransferProtocolManager::GetInstance(); const MtpStorageInfo* storage_info = mtp_manager->GetStorageInfo(storage_name); @@ -128,8 +128,8 @@ MediaTransferProtocolDeviceObserverLinux() DCHECK(!g_mtp_device_observer); g_mtp_device_observer = this; - device::MediaTransferProtocolManager* mtp_manager = - device::MediaTransferProtocolManager::GetInstance(); + MediaTransferProtocolManager* mtp_manager = + MediaTransferProtocolManager::GetInstance(); mtp_manager->AddObserver(this); EnumerateStorages(); } @@ -140,7 +140,7 @@ MediaTransferProtocolDeviceObserverLinux( GetStorageInfoFunc get_storage_info_func) : get_storage_info_func_(get_storage_info_func) { // In unit tests, we don't have a media transfer protocol manager. - DCHECK(!device::MediaTransferProtocolManager::GetInstance()); + DCHECK(!MediaTransferProtocolManager::GetInstance()); DCHECK(!g_mtp_device_observer); g_mtp_device_observer = this; } @@ -150,8 +150,8 @@ MediaTransferProtocolDeviceObserverLinux:: DCHECK_EQ(this, g_mtp_device_observer); g_mtp_device_observer = NULL; - device::MediaTransferProtocolManager* mtp_manager = - device::MediaTransferProtocolManager::GetInstance(); + MediaTransferProtocolManager* mtp_manager = + MediaTransferProtocolManager::GetInstance(); if (mtp_manager) mtp_manager->RemoveObserver(this); } @@ -187,7 +187,7 @@ bool MediaTransferProtocolDeviceObserverLinux::GetStorageInfoForPath( return true; } -// device::MediaTransferProtocolManager::Observer override. +// MediaTransferProtocolManager::Observer override. void MediaTransferProtocolDeviceObserverLinux::StorageChanged( bool is_attached, const std::string& storage_name) { @@ -229,8 +229,8 @@ void MediaTransferProtocolDeviceObserverLinux::StorageChanged( void MediaTransferProtocolDeviceObserverLinux::EnumerateStorages() { typedef std::vector<std::string> StorageList; - device::MediaTransferProtocolManager* mtp_manager = - device::MediaTransferProtocolManager::GetInstance(); + MediaTransferProtocolManager* mtp_manager = + MediaTransferProtocolManager::GetInstance(); StorageList storages = mtp_manager->GetStorages(); for (StorageList::const_iterator storage_iter = storages.begin(); storage_iter != storages.end(); ++storage_iter) { diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h index a9df128..3602ccc 100644 --- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h +++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "base/system_monitor/system_monitor.h" -#include "device/media_transfer_protocol/media_transfer_protocol_manager.h" +#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h" class FilePath; @@ -26,7 +26,7 @@ typedef void (*GetStorageInfoFunc)(const std::string& storage_name, // Helper class to send MTP storage attachment and detachment events to // SystemMonitor. class MediaTransferProtocolDeviceObserverLinux - : public device::MediaTransferProtocolManager::Observer { + : public MediaTransferProtocolManager::Observer { public: // Should only be called by browser start up code. Use GetInstance() instead. MediaTransferProtocolDeviceObserverLinux(); @@ -45,7 +45,7 @@ class MediaTransferProtocolDeviceObserverLinux explicit MediaTransferProtocolDeviceObserverLinux( GetStorageInfoFunc get_storage_info_func); - // device::MediaTransferProtocolManager::Observer implementation. + // MediaTransferProtocolManager::Observer implementation. // Exposed for unit tests. virtual void StorageChanged(bool is_attached, const std::string& storage_name) OVERRIDE; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f5e13c7..fafd32c 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2458,8 +2458,15 @@ }], ['OS=="linux"', { 'dependencies': [ + 'mtp_file_entry_proto', + 'mtp_storage_info_proto', '../build/linux/system.gyp:udev', - '../device/device.gyp:device_media_transfer_protocol', + ], + 'sources': [ + 'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc', + 'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h', + 'browser/media_transfer_protocol/media_transfer_protocol_manager.cc', + 'browser/media_transfer_protocol/media_transfer_protocol_manager.h', ], }], ['OS=="linux" and chromeos==0', { @@ -3117,5 +3124,38 @@ ], }, ], + ['OS=="linux"', { + 'targets': [ + { + # Protobuf compiler / generator for the MtpFileEntry and + # MtpFileEntries protocol buffers. + 'target_name': 'mtp_file_entry_proto', + 'type': 'static_library', + 'sources': [ + '../third_party/cros_system_api/dbus/mtp_file_entry.proto', + ], + 'variables': { + 'proto_in_dir': '../third_party/cros_system_api/dbus', + 'proto_out_dir': 'chrome/browser/media_transfer_protocol', + }, + 'includes': ['../build/protoc.gypi'], + }, + { + # Protobuf compiler / generator for the MtpStorageInfo protocol + # buffer. + 'target_name': 'mtp_storage_info_proto', + 'type': 'static_library', + 'sources': [ + '../third_party/cros_system_api/dbus/mtp_storage_info.proto', + ], + 'variables': { + 'proto_in_dir': '../third_party/cros_system_api/dbus', + 'proto_out_dir': 'chrome/browser/media_transfer_protocol', + }, + 'includes': ['../build/protoc.gypi'], + }, + ], + }, + ], ], } diff --git a/chrome/common/DEPS b/chrome/common/DEPS index a1d6202..c85a982 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+chrome/plugin", # For checking whether we're a plugin process. "+device/bluetooth", # For BluetoothDevicePermission - "+device/media_transfer_protocol", # For MediaTransferProtocolManager "+device/usb", # For UsbDevicePermission "+extensions/common", "+grit", # For generated headers diff --git a/device/device.gyp b/device/device.gyp index c8e6a50..25db3cb 100644 --- a/device/device.gyp +++ b/device/device.gyp @@ -151,53 +151,4 @@ ], }, ], - 'conditions': [ - ['OS=="linux"', { - 'targets': [ - { - # Protobuf compiler / generator for the MtpFileEntry and - # MtpFileEntries protocol buffers. - 'target_name': 'mtp_file_entry_proto', - 'type': 'static_library', - 'sources': [ - '../third_party/cros_system_api/dbus/mtp_file_entry.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus', - 'proto_out_dir': 'device/media_transfer_protocol', - }, - 'includes': ['../build/protoc.gypi'], - }, - { - # Protobuf compiler / generator for the MtpStorageInfo protocol - # buffer. - 'target_name': 'mtp_storage_info_proto', - 'type': 'static_library', - 'sources': [ - '../third_party/cros_system_api/dbus/mtp_storage_info.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus', - 'proto_out_dir': 'device/media_transfer_protocol', - }, - 'includes': ['../build/protoc.gypi'], - }, - { - 'target_name': 'device_media_transfer_protocol', - 'type': 'static_library', - 'dependencies': [ - '../build/linux/system.gyp:dbus', - 'mtp_file_entry_proto', - 'mtp_storage_info_proto', - ], - 'sources': [ - 'media_transfer_protocol/media_transfer_protocol_daemon_client.cc', - 'media_transfer_protocol/media_transfer_protocol_daemon_client.h', - 'media_transfer_protocol/media_transfer_protocol_manager.cc', - 'media_transfer_protocol/media_transfer_protocol_manager.h', - ], - }, - ], - }], - ], } diff --git a/device/media_transfer_protocol/DEPS b/device/media_transfer_protocol/DEPS deleted file mode 100644 index e461e37..0000000 --- a/device/media_transfer_protocol/DEPS +++ /dev/null @@ -1,8 +0,0 @@ -include_rules = [ - # The media transfer protocol daemon uses D-Bus. - "+dbus", - "+chrome/common/chrome_switches.h", - "+chromeos/dbus", - "+content/public/browser/browser_thread.h", - "+third_party/cros_system_api/dbus", -] diff --git a/third_party/mtpd/mtpd.gyp b/third_party/mtpd/mtpd.gyp index 8d41442..62a363de 100644 --- a/third_party/mtpd/mtpd.gyp +++ b/third_party/mtpd/mtpd.gyp @@ -11,8 +11,8 @@ '../../base/base.gyp:base', '../../build/linux/system.gyp:glib', '../../build/linux/system.gyp:udev', - '../../device/device.gyp:mtp_file_entry_proto', - '../../device/device.gyp:mtp_storage_info_proto', + '../../chrome/chrome.gyp:mtp_file_entry_proto', + '../../chrome/chrome.gyp:mtp_storage_info_proto', '../../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:dbus_cplusplus', '../../third_party/libmtp/libmtp.gyp:libmtp', ], @@ -37,7 +37,7 @@ ], 'include_dirs': [ '.', - '<(SHARED_INTERMEDIATE_DIR)/protoc_out/device/media_transfer_protocol', + '<(SHARED_INTERMEDIATE_DIR)/protoc_out/chrome/browser/media_transfer_protocol', ], }, ], |