From 4b6de89b8a0fedf9e6a379f317f19a04c84967ce Mon Sep 17 00:00:00 2001 From: "kmadhusu@chromium.org" Date: Fri, 4 Jan 2013 18:06:06 +0000 Subject: 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 --- chrome/browser/chrome_browser_main_linux.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/chrome_browser_main_linux.cc') 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; -- cgit v1.1