summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 20:33:44 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 20:33:44 +0000
commit846ed9c3c2fae4108f1f337b82cde8687f6d9f89 (patch)
treebca50c1ce91d2483f617743ecb35d6f89835a769
parente2faa004dae6837589803b8e0c6b896aa56e64bb (diff)
downloadchromium_src-846ed9c3c2fae4108f1f337b82cde8687f6d9f89.zip
chromium_src-846ed9c3c2fae4108f1f337b82cde8687f6d9f89.tar.gz
chromium_src-846ed9c3c2fae4108f1f337b82cde8687f6d9f89.tar.bz2
GTTF: Ensure that when we're testing the logging system will not display dialogs.
When I was running ui_tests on Linux at the end there were to xmessage windows on the screen. They shouldn't be there, and they might gum up the bots, especially if it happens on Windows. TEST=none BUG=none Review URL: http://codereview.chromium.org/2847085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54180 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/logging.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/logging.cc b/base/logging.cc
index 851bdcc..09decbb 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -325,6 +325,9 @@ void DisplayDebugMessageInDialog(const std::string& str) {
if (str.empty())
return;
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoErrorDialogs))
+ return;
+
#if defined(OS_WIN)
// For Windows programs, it's possible that the message loop is
// messed up on a fatal error, and creating a MessageBox will cause