From 01e77f96bbd03a13876ae6fb2cf684198d858094 Mon Sep 17 00:00:00 2001 From: "carlosvaldivia@google.com" Date: Tue, 10 Apr 2012 18:34:44 +0000 Subject: Upstream Android native crash handling changes. This is actulaly the second time. Revert "Revert 131404 - Upstream native crash handling changes for Android." This reverts commit 421df96aab6267e963ddff16c9f738aa903a2cba. Conflicts: chrome/browser/chrome_browser_main.cc BUG= TEST= Review URL: http://codereview.chromium.org/9967017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131593 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_browser_main_linux.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/chrome_browser_main_linux.cc') diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index 2ba1b41..1354ffb 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -8,7 +8,7 @@ #include #include "base/linux_util.h" -#include "chrome/app/breakpad_linux.h" +#include "chrome/app/breakpad_linuxish.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/env_vars.h" #include "chrome/common/pref_names.h" -- cgit v1.1