Respect Linux user prefs with regards to crash reporting.

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <commctrl.h>
-#endif
-
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/field_trial.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/scoped_nsautorelease_pool.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/result_codes.h"
+#include "chrome/installer/util/google_update_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/net_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/http/http_network_session.h"
 
 #if defined(OS_POSIX)
 // TODO(port): get rid of this include. It's used just to provide declarations
 // and stub definitions for classes we encouter during the porting effort.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #include <signal.h>
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
 // other platforms. For now, it's just a stub. This is a serious work in
 // progress and should not be taken as an indication of a real refactoring.
 
 #if defined(OS_WIN)
 
 #include <windows.h>
+#include <commctrl.h>
 #include <shellapi.h>
 
 #include "app/win_util.h"
 #include "base/registry.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 14 matching lines @@
 #include "net/http/http_network_layer.h"
 #include "sandbox/src/sandbox.h"
 #include "views/widget/accelerator_handler.h"
 
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/common/gtk_util.h"
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
-#include "chrome/installer/util/google_update_settings.h"
-#endif  // OS_WIN || OS_MACOSX
-
 namespace Platform {
 
 void WillInitializeMainMessageLoop(const CommandLine & command_line);
 void WillTerminate();
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 // Perform any platform-specific work that needs to be done before the main
 // message loop is created and initialized.
 void WillInitializeMainMessageLoop(const CommandLine & command_line) {
 }
@@ skipping 117 matching lines @@
 
 #if defined(OS_POSIX)
   // We need to accept SIGCHLD, even though our handler is a no-op because
   // otherwise we cannot wait on children. (According to POSIX 2001.)
   struct sigaction action;
   memset(&action, 0, sizeof(action));
   action.sa_handler = SIGCHLDHandler;
   CHECK(sigaction(SIGCHLD, &action, NULL) == 0);
 #endif
 
-#if defined(OS_LINUX)
-  EnableCrashDumping();
-#endif
-
   // Do platform-specific things (such as finishing initializing Cocoa)
   // prior to instantiating the message loop. This could be turned into a
   // broadcast notification.
   Platform::WillInitializeMainMessageLoop(parsed_command_line);
 
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
   // Initialize the SystemMonitor
   base::SystemMonitor::Start();
 #if defined(OS_WIN)
@@ skipping 64 matching lines @@
   // locale dll to load.
   PrefService* local_state = browser_process->local_state();
   DCHECK(local_state);
 
   // Initialize ResourceBundle which handles files loaded from external
   // sources. This has to be done before uninstall code path and before prefs
   // are registered.
   local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
   local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
 
-#if defined(OS_MACOSX)
-  // On Mac OS X we display the first run dialog as early as possible, so we can
-  // get the stats enabled.
-  // TODO:
+#if defined(OS_POSIX)
+  // On Mac OS X / Linux we display the first run dialog as early as possible,
+  // so we can get the stats enabled.
+  // TODO(port):
   // We check the kNoFirstRun command line switch explicitly here since the
   // early placement of this block happens before that's factored into
   // first_run_ui_bypass, we probably want to move that block up
   // and remove the explicit check from here in the long run.
   if (is_first_run && !first_run_ui_bypass &&
       !parsed_command_line.HasSwitch(switches::kNoFirstRun)) {
     // Dummy value, we don't need the profile for the OS X version of this
     // method at present.
     Profile* profile = NULL;
     OpenFirstRunDialog(profile, &process_singleton);
   }
-#endif  // OS_MACOSX
+#endif  // OS_POSIX
 
   // During first run we read the google_update registry key to find what
   // language the user selected when downloading the installer. This
   // becomes our default language in the prefs.
   if (is_first_run) {
     std::wstring install_lang;
     if (GoogleUpdateSettings::GetLanguage(&install_lang))
       local_state->SetString(prefs::kApplicationLocale, install_lang);
     if (GoogleUpdateSettings::GetCollectStatsConsent())
       local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
@@ skipping 171 matching lines @@
     return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS;
 
   process_singleton.Create();
 
 #if defined(TOOLKIT_GTK)
   // It is important for this to happen before the first run dialog, as it
   // styles the dialog as well.
   gtk_util::InitRCStyles();
 #endif
 
-  // TODO: This block of code should probably be used on all platforms!
-  // On Mac OS X we display this dialog before setting the value of
+  // TODO(port): This block of code should probably be used on all platforms!
+  // On Mac OS X / Linux we display this dialog before setting the value of
   // kMetricsReportingEnabled, so we display this dialog much earlier.
   // On Windows a download is tagged with stats enabled/disabled so the UI
   // can be displayed later in the startup process.
-#if !defined(OS_MACOSX)
+#if !defined(OS_POSIX)
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (is_first_run && !first_run_ui_bypass) {
     OpenFirstRunDialog(profile, &process_singleton);
   }
-#endif  // OS_MACOSX
+#endif  // OS_POSIX
 
   // Sets things up so that if we crash from this point on, a dialog will
   // popup asking the user to restart chrome. It is done this late to avoid
   // testing against a bunch of special cases that are taken care early on.
   PrepareRestartOnCrashEnviroment(parsed_command_line);
 
 #if defined(OS_WIN)
   // Initialize Winsock.
   net::EnsureWinsockInit();
 #endif  // defined(OS_WIN)
@@ skipping 161 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }