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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 11722025: Revert 175073 because it fails to compile on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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: chrome/browser/chrome_browser_main_linux.cc
===================================================================
--- chrome/browser/chrome_browser_main_linux.cc (revision 175074)
+++ chrome/browser/chrome_browser_main_linux.cc (working copy)
@@ -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() {
if (did_pre_profile_init_)
- device::MediaTransferProtocolManager::Shutdown();
+ chrome::MediaTransferProtocolManager::Shutdown();
}
void ChromeBrowserMainPartsLinux::PreProfileInit() {
@@ -106,7 +106,7 @@
removable_device_notifications_linux_->Init();
#endif
- device::MediaTransferProtocolManager::Initialize();
+ chrome::MediaTransferProtocolManager::Initialize();
did_pre_profile_init_ = true;

Powered by Google App Engine
This is Rietveld 408576698