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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 12082017: Remove dependencies to 'chrome' from device/media_transfer_protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comment 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 | « chrome/browser/chrome_browser_main_linux.h ('k') | 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 ec39b182b0f2b30570e7f584381022b3f3b66aa0..f4dd39252c7b4a81d130df6bf4a90ee3933dcec4 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -109,11 +109,11 @@ bool IsCrashReportingEnabled(const PrefService* local_state) {
ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
const content::MainFunctionParams& parameters)
: ChromeBrowserMainPartsPosix(parameters),
- did_pre_profile_init_(false) {
+ initialized_media_transfer_protocol_manager_(false) {
}
ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
- if (did_pre_profile_init_)
+ if (initialized_media_transfer_protocol_manager_)
device::MediaTransferProtocolManager::Shutdown();
}
@@ -138,16 +138,19 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
removable_device_notifications_linux_->Init();
#endif
- device::MediaTransferProtocolManager::Initialize();
-
- did_pre_profile_init_ = true;
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+ device::MediaTransferProtocolManager::Initialize();
+ initialized_media_transfer_protocol_manager_ = true;
+ }
ChromeBrowserMainPartsPosix::PreProfileInit();
}
void ChromeBrowserMainPartsLinux::PostProfileInit() {
- media_transfer_protocol_device_observer_.reset(
- new chrome::MediaTransferProtocolDeviceObserverLinux());
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+ media_transfer_protocol_device_observer_.reset(
+ new chrome::MediaTransferProtocolDeviceObserverLinux());
+ }
ChromeBrowserMainPartsPosix::PostProfileInit();
}
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.h ('k') | device/media_transfer_protocol/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698