diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 03:06:12 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 03:06:12 +0000 |
commit | 2f4a8e1220d91ba95c2c46ec232dd53d27807ecd (patch) | |
tree | a353800ca5728e7c26423af7cccedf9812404d9a /base/message_pump_x.cc | |
parent | 27488c22fe34d431fa34576032d8a0fc92b61572 (diff) | |
download | chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.zip chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.gz chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.bz2 |
Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base.
I tried hard not to change CHECKs that had side effects. I kept fatal checks
that seemed security or debugging-info (in crash reports) sensitive, and ones
that seems particularly well-conceived.
Review URL: http://codereview.chromium.org/8368009
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8351025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_x.cc')
-rw-r--r-- | base/message_pump_x.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc index 15276e4..a9b1b8a 100644 --- a/base/message_pump_x.cc +++ b/base/message_pump_x.cc @@ -66,7 +66,7 @@ void InitializeXInput2(void) { int event, err; if (!XQueryExtension(display, "XInputExtension", &xiopcode, &event, &err)) { - DVLOG(1) << "X Input extension not available."; + VLOG(1) << "X Input extension not available."; xiopcode = -1; return; } @@ -78,13 +78,13 @@ void InitializeXInput2(void) { int major = 2, minor = 0; #endif if (XIQueryVersion(display, &major, &minor) == BadRequest) { - DVLOG(1) << "XInput2 not supported in the server."; + VLOG(1) << "XInput2 not supported in the server."; xiopcode = -1; return; } #if defined(USE_XI2_MT) if (major < 2 || (major == 2 && minor < USE_XI2_MT)) { - DVLOG(1) << "XI version on server is " << major << "." << minor << ". " + VLOG(1) << "XI version on server is " << major << "." << minor << ". " << "But 2." << USE_XI2_MT << " is required."; xiopcode = -1; return; @@ -148,7 +148,7 @@ void MessagePumpX::InitXSource() { DCHECK(!x_source_); GPollFD* x_poll = new GPollFD(); Display* display = GetDefaultXDisplay(); - DCHECK(display) << "Unable to get connection to X server"; + CHECK(display) << "Unable to get connection to X server"; x_poll->fd = ConnectionNumber(display); x_poll->events = G_IO_IN; @@ -186,7 +186,7 @@ bool MessagePumpX::ProcessXEvent(XEvent* xev) { should_quit = true; Quit(); } else if (status == MessagePumpDispatcher::EVENT_IGNORED) { - DVLOG(1) << "Event (" << xev->type << ") not handled."; + VLOG(1) << "Event (" << xev->type << ") not handled."; } DidProcessXEvent(xev); } |