| 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 #if !defined(OS_CHROMEOS) | 7 #if !defined(OS_CHROMEOS) |
| 8 #include "chrome/browser/storage_monitor/storage_monitor_linux.h" | 8 #include "chrome/browser/storage_monitor/storage_monitor_linux.h" |
| 9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
| 10 #endif | 10 #endif |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 #endif | 126 #endif |
| 127 | 127 |
| 128 #if !defined(OS_CHROMEOS) | 128 #if !defined(OS_CHROMEOS) |
| 129 const base::FilePath kDefaultMtabPath("/etc/mtab"); | 129 const base::FilePath kDefaultMtabPath("/etc/mtab"); |
| 130 storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath)); | 130 storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath)); |
| 131 #endif | 131 #endif |
| 132 | 132 |
| 133 ChromeBrowserMainPartsPosix::PreProfileInit(); | 133 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 void ChromeBrowserMainPartsLinux::PostProfileInit() { | |
| 137 #if !defined(OS_CHROMEOS) | |
| 138 storage_monitor_->Init(); | |
| 139 #endif | |
| 140 | |
| 141 ChromeBrowserMainPartsPosix::PostProfileInit(); | |
| 142 } | |
| 143 | |
| 144 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { | 136 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { |
| 145 #if !defined(OS_CHROMEOS) | 137 #if !defined(OS_CHROMEOS) |
| 146 // Delete it now. Otherwise the FILE thread would be gone when we try to | 138 // Delete it now. Otherwise the FILE thread would be gone when we try to |
| 147 // release it in the dtor and Valgrind would report a leak on almost every | 139 // release it in the dtor and Valgrind would report a leak on almost every |
| 148 // single browser_test. | 140 // single browser_test. |
| 149 storage_monitor_.reset(); | 141 storage_monitor_.reset(); |
| 150 #endif | 142 #endif |
| 151 | 143 |
| 152 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); | 144 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); |
| 153 } | 145 } |
| OLD | NEW |