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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 12092074: Remove 'content' dependency from device/media_transfer_protocol (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + fixed comments Created 7 years, 11 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
« no previous file with comments | « no previous file | device/media_transfer_protocol/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: 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 f4dd39252c7b4a81d130df6bf4a90ee3933dcec4..196e9c3a2ebb25580b84743e845ea4f11f01d263 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -4,11 +4,13 @@
#include "chrome/browser/chrome_browser_main_linux.h"
+#include "base/message_loop_proxy.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"
+#include "content/public/browser/browser_thread.h"
#endif
#if defined(USE_LINUX_BREAKPAD)
@@ -21,7 +23,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
#include "chrome/common/pref_names.h"
-#include "content/public/browser/browser_thread.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -139,7 +140,12 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
#endif
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
- device::MediaTransferProtocolManager::Initialize();
+ scoped_refptr<base::MessageLoopProxy> loop_proxy;
+#if !defined(OS_CHROMEOS)
+ loop_proxy = content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::FILE);
+#endif
+ device::MediaTransferProtocolManager::Initialize(loop_proxy);
initialized_media_transfer_protocol_manager_ = true;
}
« no previous file with comments | « no previous file | device/media_transfer_protocol/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698