diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 22:12:23 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 22:12:23 +0000 |
commit | ba80aa757802e51920657a5416e50139f146c6b0 (patch) | |
tree | d5ec93d13c6ecf67eef112d1fd8e46df593d53cc /chrome/browser/gtk/first_run_dialog.cc | |
parent | dec7b17e7308a19743191c04f900927e6df32fda (diff) | |
download | chromium_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/browser/gtk/first_run_dialog.cc')
-rw-r--r-- | chrome/browser/gtk/first_run_dialog.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/gtk/first_run_dialog.cc b/chrome/browser/gtk/first_run_dialog.cc index bac0ca2..b8797c9 100644 --- a/chrome/browser/gtk/first_run_dialog.cc +++ b/chrome/browser/gtk/first_run_dialog.cc @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" -#include "chrome/app/breakpad_linux.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/gtk_util.h" @@ -17,6 +16,10 @@ #include "grit/google_chrome_strings.h" #include "grit/locale_settings.h" +#if defined(USE_LINUX_BREAKPAD) +#include "chrome/app/breakpad_linux.h" +#endif + // static bool FirstRunDialog::Show(Profile* profile) { int response = -1; @@ -134,9 +137,11 @@ void FirstRunDialog::OnDialogResponse(GtkWidget* widget, int response) { // Check if user has opted into reporting. if (report_crashes_ && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) { +#if defined(USE_LINUX_BREAKPAD) if (GoogleUpdateSettings::SetCollectStatsConsent(true)) { InitCrashReporter(); } +#endif } else { GoogleUpdateSettings::SetCollectStatsConsent(false); } |