Index: chrome/browser/chrome_browser_main_linux.cc |
=================================================================== |
--- chrome/browser/chrome_browser_main_linux.cc (revision 272375) |
+++ chrome/browser/chrome_browser_main_linux.cc (working copy) |
@@ -4,33 +4,16 @@ |
#include "chrome/browser/chrome_browser_main_linux.h" |
-#include <stdlib.h> |
- |
-#include "base/command_line.h" |
-#include "base/linux_util.h" |
-#include "base/prefs/pref_service.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/metrics/metrics_service.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/env_vars.h" |
-#include "chrome/common/pref_names.h" |
#include "components/breakpad/app/breakpad_linux.h" |
#if !defined(OS_CHROMEOS) |
+#include "base/linux_util.h" |
#include "chrome/browser/sxs_linux.h" |
#include "content/public/browser/browser_thread.h" |
#endif |
-namespace { |
- |
-#if !defined(OS_CHROMEOS) |
-void GetLinuxDistroCallback() { |
- base::GetLinuxDistro(); // Initialize base::linux_distro if needed. |
-} |
-#endif |
- |
-} // namespace |
- |
ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( |
const content::MainFunctionParams& parameters) |
: ChromeBrowserMainPartsPosix(parameters) { |
@@ -43,12 +26,12 @@ |
#if !defined(OS_CHROMEOS) |
// Needs to be called after we have chrome::DIR_USER_DATA and |
// g_browser_process. This happens in PreCreateThreads. |
- content::BrowserThread::PostTask(content::BrowserThread::FILE, |
- FROM_HERE, |
- base::Bind(&GetLinuxDistroCallback)); |
+ // base::GetLinuxDistro() will initialize its value if needed. |
+ content::BrowserThread::PostBlockingPoolTask( |
+ FROM_HERE, |
+ base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); |
- content::BrowserThread::PostTask( |
- content::BrowserThread::FILE, |
+ content::BrowserThread::PostBlockingPoolTask( |
FROM_HERE, |
base::Bind(&sxs_linux::AddChannelMarkToUserDataDir)); |
#endif |