OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_browser_main_linux.h" | 5 #include "chrome/browser/chrome_browser_main_linux.h" |
6 | 6 |
7 #include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager
.h" | 7 #include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager
.h" |
8 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_
linux.h" | 8 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_
linux.h" |
9 | 9 |
10 #if !defined(OS_CHROMEOS) | 10 #if !defined(OS_CHROMEOS) |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 chrome::MediaTransferProtocolManager::Initialize(); | 117 chrome::MediaTransferProtocolManager::Initialize(); |
118 | 118 |
119 did_pre_profile_init_ = true; | 119 did_pre_profile_init_ = true; |
120 | 120 |
121 ChromeBrowserMainPartsPosix::PreProfileInit(); | 121 ChromeBrowserMainPartsPosix::PreProfileInit(); |
122 } | 122 } |
123 | 123 |
124 void ChromeBrowserMainPartsLinux::PostProfileInit() { | 124 void ChromeBrowserMainPartsLinux::PostProfileInit() { |
125 media_transfer_protocol_device_observer_.reset( | 125 media_transfer_protocol_device_observer_.reset( |
126 new chrome::MediaTransferProtocolDeviceObserverLinux()); | 126 new chrome::MediaTransferProtocolDeviceObserverLinux()); |
| 127 |
| 128 ChromeBrowserMainPartsPosix::PostProfileInit(); |
127 } | 129 } |
128 | 130 |
129 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { | 131 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { |
130 #if !defined(OS_CHROMEOS) | 132 #if !defined(OS_CHROMEOS) |
131 // Release it now. Otherwise the FILE thread would be gone when we try to | 133 // Release it now. Otherwise the FILE thread would be gone when we try to |
132 // release it in the dtor and Valgrind would report a leak on almost ever | 134 // release it in the dtor and Valgrind would report a leak on almost ever |
133 // single browser_test. | 135 // single browser_test. |
134 removable_device_notifications_linux_ = NULL; | 136 removable_device_notifications_linux_ = NULL; |
135 #endif | 137 #endif |
136 | 138 |
137 media_transfer_protocol_device_observer_.reset(); | 139 media_transfer_protocol_device_observer_.reset(); |
138 | 140 |
139 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); | 141 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); |
140 } | 142 } |
OLD | NEW |