summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 22:12:23 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 22:12:23 +0000
commitba80aa757802e51920657a5416e50139f146c6b0 (patch)
treed5ec93d13c6ecf67eef112d1fd8e46df593d53cc /chrome/app/chrome_dll_main.cc
parentdec7b17e7308a19743191c04f900927e6df32fda (diff)
downloadchromium_src-ba80aa757802e51920657a5416e50139f146c6b0.zip
chromium_src-ba80aa757802e51920657a5416e50139f146c6b0.tar.gz
chromium_src-ba80aa757802e51920657a5416e50139f146c6b0.tar.bz2
Make Linux Breakpad initialization call to lsb_release asynchronous. Also wrap more
things in USE_LINUX_BREAKPAD while we're at it. BUG=21782 TEST=Add time.sleep(10) to /usr/bin/lsb_release; starting Chrome should not take 10 seconds more. Review URL: http://codereview.chromium.org/209042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 805565d..9f135b5 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -56,6 +56,8 @@
#endif
#if defined(OS_LINUX)
#include "base/nss_init.h"
+#endif
+#if defined(USE_LINUX_BREAKPAD)
#include "chrome/app/breakpad_linux.h"
#endif
#include "chrome/app/scoped_ole_initializer.h"