summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 20:30:13 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 20:30:13 +0000
commitc74d7c570eccadf7be968a4767ea67c14ca08009 (patch)
treee7b7878ef524456487fb9ff16733b233d33aa85a /chrome
parent79b0f6c1ee5e076fa79d612a8c5cff711e9a5821 (diff)
downloadchromium_src-c74d7c570eccadf7be968a4767ea67c14ca08009.zip
chromium_src-c74d7c570eccadf7be968a4767ea67c14ca08009.tar.gz
chromium_src-c74d7c570eccadf7be968a4767ea67c14ca08009.tar.bz2
Don't die on glib/gtk/gdk errors in release mode.
Review URL: http://codereview.chromium.org/113654 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chrome_dll_main.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 2bb7123..223b303 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -159,7 +159,6 @@ static void GLibLogHandler(const gchar* log_domain,
if (!message)
message = "<no message>";
-
if (strstr(message, "Loading IM context type") ||
strstr(message, "wrong ELF class: ELFCLASS64")) {
// http://crbug.com/9643
@@ -172,7 +171,11 @@ static void GLibLogHandler(const gchar* log_domain,
// http://crbug.com/11133
LOG(ERROR) << "Bug 11133";
} else {
+#ifdef NDEBUG
+ LOG(ERROR) << log_domain << ": " << message;
+#else
LOG(FATAL) << log_domain << ": " << message;
+#endif
}
}