diff options
| author | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:52:44 +0000 |
|---|---|---|
| committer | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:52:44 +0000 |
| commit | 6653c19c044e724ad9a93248611abd2135d16a1a (patch) | |
| tree | 1e036d686937704495302c125d7f3f200a521470 /chrome/browser/chrome_browser_main_x11.cc | |
| parent | b168ddfb28b4d83213dcfd5974ba64d2dc964030 (diff) | |
| download | chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.zip chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.tar.gz chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.tar.bz2 | |
Upstream crash changes for android.
Third time is a charm.
Original Reviews:
https://chromiumcodereview.appspot.com/9838033/
http://codereview.chromium.org/9967017
Revert "Revert 131593"
This reverts commit e306ea7f630d4264075913ea3a1a728d98ca9605.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9960072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_x11.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_x11.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc index 55968ca..fbd832f 100644 --- a/chrome/browser/chrome_browser_main_x11.cc +++ b/chrome/browser/chrome_browser_main_x11.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,7 +15,7 @@ #include "ui/base/x/x11_util_internal.h" #if defined(USE_LINUX_BREAKPAD) -#include "chrome/app/breakpad_linux.h" +#include "chrome/app/breakpad_linuxish.h" #endif using content::BrowserThread; |