summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_x11.cc
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 15:09:12 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 15:09:12 +0000
commit1602cde709fd963722d0a8e6422cc39080bfaed9 (patch)
treead73d52d733f91f7ba812eeae49a24b626735bc5 /chrome/browser/chrome_browser_main_x11.cc
parent4649b3757c24b2d98d3aa88e2b06829ddd0ddadf (diff)
downloadchromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.zip
chromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.tar.gz
chromium_src-1602cde709fd963722d0a8e6422cc39080bfaed9.tar.bz2
Rename back _linuxish to linux.
_linuxish is ambiguous. Use 'target_conditions' to include the required files that are for linux on Android. (TBR because the changes in chrome/browser/ui/gtk and content/app/android are all simple changes of #include file names) BUG=none TEST=Build successfully TBR=erg@chromium.org,jrg@chromium.org Review URL: https://chromiumcodereview.appspot.com/10532178 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_x11.cc')
-rw-r--r--chrome/browser/chrome_browser_main_x11.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc
index 1c57d9a..bc97bce 100644
--- a/chrome/browser/chrome_browser_main_x11.cc
+++ b/chrome/browser/chrome_browser_main_x11.cc
@@ -16,7 +16,7 @@
#include "ui/base/x/x11_util_internal.h"
#if defined(USE_LINUX_BREAKPAD)
-#include "chrome/app/breakpad_linuxish.h"
+#include "chrome/app/breakpad_linux.h"
#endif
using content::BrowserThread;