diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:06:06 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 18:06:06 +0000 |
| commit | 4b6de89b8a0fedf9e6a379f317f19a04c84967ce (patch) | |
| tree | a42dbddf09b25b7bf4da5000496bd7875590c0f4 /chrome/browser/chrome_browser_main_linux.cc | |
| parent | d0274482cbfce3d738f34efbf7a3a9a4c3d0cad4 (diff) | |
| download | chromium_src-4b6de89b8a0fedf9e6a379f317f19a04c84967ce.zip chromium_src-4b6de89b8a0fedf9e6a379f317f19a04c84967ce.tar.gz chromium_src-4b6de89b8a0fedf9e6a379f317f19a04c84967ce.tar.bz2 | |
Try 2 [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device.
BUG=156929
TEST=none
Original CL: https://chromiumcodereview.appspot.com/11744014
Review URL: https://chromiumcodereview.appspot.com/11744030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_linux.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index db40bec..2bf9e3a 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_) - chrome::MediaTransferProtocolManager::Shutdown(); + device::MediaTransferProtocolManager::Shutdown(); } void ChromeBrowserMainPartsLinux::PreProfileInit() { @@ -106,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { removable_device_notifications_linux_->Init(); #endif - chrome::MediaTransferProtocolManager::Initialize(); + device::MediaTransferProtocolManager::Initialize(); did_pre_profile_init_ = true; |