Index: remoting/client/plugin/chromoting_instance.cc |
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc |
index 2c2ab84493cca4345e29b47d54b10d7a46870153..3996a1955ce89430422e96abd4a37e37d06fbde5 100644 |
--- a/remoting/client/plugin/chromoting_instance.cc |
+++ b/remoting/client/plugin/chromoting_instance.cc |
@@ -171,7 +171,7 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance) |
jingle_glue::JingleThreadWrapper::WrapTaskRunner(plugin_task_runner_); |
// Register a global log handler. |
- ChromotingInstance::RegisterLogMessageHandler(); |
+ ChromotingInstance::RegisterLogMessageListener(); |
nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface()); |
mount("", "/etc", "memfs", 0, ""); |
@@ -1037,12 +1037,12 @@ void ChromotingInstance::UpdatePerfStatsInUI() { |
} |
// static |
-void ChromotingInstance::RegisterLogMessageHandler() { |
+void ChromotingInstance::RegisterLogMessageListener() { |
base::AutoLock lock(g_logging_lock.Get()); |
// Set up log message handler. |
// This is not thread-safe so we need it within our lock. |
- logging::SetLogMessageHandler(&LogToUI); |
+ logging::AddLogMessageListener(LogToUI); |
} |
void ChromotingInstance::RegisterLoggingInstance() { |
@@ -1062,7 +1062,7 @@ void ChromotingInstance::UnregisterLoggingInstance() { |
} |
// static |
-bool ChromotingInstance::LogToUI(int severity, const char* file, int line, |
+void ChromotingInstance::LogToUI(int severity, const char* file, int line, |
size_t message_start, |
const std::string& str) { |
PP_LogLevel log_level = PP_LOGLEVEL_ERROR; |
@@ -1097,8 +1097,6 @@ bool ChromotingInstance::LogToUI(int severity, const char* file, int line, |
// may crash before the message is delivered to the console. |
if (severity == logging::LOG_FATAL) |
base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); |
- |
- return false; |
} |
bool ChromotingInstance::IsConnected() { |