Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: remoting/host/native_messaging/log_message_handler.cc

Issue 2034393004: Allow multiple logging::LogMessage{Handler,Listener}s Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up, MockLog uses listener Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/native_messaging/log_message_handler.cc
diff --git a/remoting/host/native_messaging/log_message_handler.cc b/remoting/host/native_messaging/log_message_handler.cc
index e2e3cd8b58c67d9c116d172610dba878b52c5fdf..756542e403e167c3030f3a99b6ff74140e115cfd 100644
--- a/remoting/host/native_messaging/log_message_handler.cc
+++ b/remoting/host/native_messaging/log_message_handler.cc
@@ -36,18 +36,17 @@ LogMessageHandler::LogMessageHandler(
LOG(FATAL) << "LogMessageHandler is already registered. Only one instance "
<< "per process is allowed.";
}
- previous_log_message_handler_ = logging::GetLogMessageHandler();
- logging::SetLogMessageHandler(&LogMessageHandler::OnLogMessage);
+ logging::PushLogMessageHandler(&LogMessageHandler::OnLogMessage);
g_log_message_handler = this;
}
LogMessageHandler::~LogMessageHandler() {
base::AutoLock lock(g_log_message_handler_lock.Get());
- if (logging::GetLogMessageHandler() != &LogMessageHandler::OnLogMessage) {
+ if (logging::GetTopLogMessageHandler() != &LogMessageHandler::OnLogMessage) {
LOG(FATAL) << "LogMessageHandler is not the top-most message handler. "
<< "Cannot unregister.";
}
Dan Beam 2016/07/15 03:11:19 ^ do we still need this?
wychen 2016/07/18 15:44:12 Cleaned this up to simplify logic.
- logging::SetLogMessageHandler(previous_log_message_handler_);
+ logging::PopLogMessageHandler(&LogMessageHandler::OnLogMessage);
g_log_message_handler = nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698