| 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" | |
| 9 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 10 #endif | 9 #endif |
| 11 | 10 |
| 12 #if defined(USE_LINUX_BREAKPAD) | 11 #if defined(USE_LINUX_BREAKPAD) |
| 13 #include <stdlib.h> | 12 #include <stdlib.h> |
| 14 | 13 |
| 15 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 16 #include "base/linux_util.h" | 15 #include "base/linux_util.h" |
| 17 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
| 18 #include "chrome/app/breakpad_linux.h" | 17 #include "chrome/app/breakpad_linux.h" |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 // g_browser_process. This happens in PreCreateThreads. | 117 // g_browser_process. This happens in PreCreateThreads. |
| 119 content::BrowserThread::PostTask(content::BrowserThread::FILE, | 118 content::BrowserThread::PostTask(content::BrowserThread::FILE, |
| 120 FROM_HERE, | 119 FROM_HERE, |
| 121 base::Bind(&GetLinuxDistroCallback)); | 120 base::Bind(&GetLinuxDistroCallback)); |
| 122 #endif | 121 #endif |
| 123 | 122 |
| 124 if (IsCrashReportingEnabled(local_state())) | 123 if (IsCrashReportingEnabled(local_state())) |
| 125 InitCrashReporter(); | 124 InitCrashReporter(); |
| 126 #endif | 125 #endif |
| 127 | 126 |
| 128 #if !defined(OS_CHROMEOS) | |
| 129 const base::FilePath kDefaultMtabPath("/etc/mtab"); | |
| 130 storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath)); | |
| 131 #endif | |
| 132 | |
| 133 ChromeBrowserMainPartsPosix::PreProfileInit(); | 127 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 134 } | 128 } |
| 135 | |
| 136 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { | |
| 137 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); | |
| 138 | |
| 139 #if !defined(OS_CHROMEOS) | |
| 140 // Delete it now. Otherwise the FILE thread would be gone when we try to | |
| 141 // release it in the dtor and Valgrind would report a leak on almost every | |
| 142 // single browser_test. | |
| 143 storage_monitor_.reset(); | |
| 144 #endif | |
| 145 } | |
| OLD | NEW |