Chromium Code Reviews| Index: remoting/host/linux/x11_util.cc |
| diff --git a/remoting/host/linux/x11_util.cc b/remoting/host/linux/x11_util.cc |
| index 1e88ba78c5fbdbea6ea8dfab6fabe56bb239a495..cda4058bfb768cb22e5631a1debfe345944a3c1a 100644 |
| --- a/remoting/host/linux/x11_util.cc |
| +++ b/remoting/host/linux/x11_util.cc |
| @@ -15,10 +15,10 @@ static ScopedXErrorHandler* g_handler = nullptr; |
| ScopedXErrorHandler::ScopedXErrorHandler(const Handler& handler): |
| handler_(handler), |
| ok_(true) { |
| - // This is a poor-man's check for incorrect usage. It doesn't handle the case |
| - // where a mix of ScopedXErrorHandler and raw XSetErrorHandler calls are used, |
| - // and it disallows nested ScopedXErrorHandlers on the same thread, despite |
| - // these being perfectly safe. |
| + // This is an non-exhaustive check for incorrect usage. It doesn't handle the |
|
Lambros
2016/11/29 18:36:06
s/an/a/
Matt Giuca
2016/11/30 07:28:59
Done.
|
| + // case where a mix of ScopedXErrorHandler and raw XSetErrorHandler calls are |
| + // used, and it disallows nested ScopedXErrorHandlers on the same thread, |
| + // despite these being perfectly safe. |
| DCHECK(g_handler == nullptr); |
| g_handler = this; |
| previous_handler_ = XSetErrorHandler(HandleXErrors); |