| Index: mojo/environment/default_logger.cc
|
| diff --git a/mojo/environment/default_logger_impl.cc b/mojo/environment/default_logger.cc
|
| similarity index 78%
|
| rename from mojo/environment/default_logger_impl.cc
|
| rename to mojo/environment/default_logger.cc
|
| index 67ba5a507978ecb0101e19c349b91bede98603fc..693b37b2a7c79727e0ed7c33220f9fc6633de26f 100644
|
| --- a/mojo/environment/default_logger_impl.cc
|
| +++ b/mojo/environment/default_logger.cc
|
| @@ -2,10 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/environment/default_logger_impl.h"
|
| +#include "mojo/environment/default_logger.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "mojo/public/c/environment/logger.h"
|
|
|
| namespace mojo {
|
| namespace internal {
|
| @@ -44,8 +45,13 @@ void LogMessage(MojoLogLevel log_level,
|
| if (chromium_log_level < chromium_min_log_level)
|
| return;
|
|
|
| - logging::LogMessage(source_file, source_line, chromium_log_level).stream()
|
| - << message;
|
| + if (source_file) {
|
| + logging::LogMessage(source_file, static_cast<int>(source_line),
|
| + chromium_log_level).stream()
|
| + << message;
|
| + } else {
|
| + logging::LogMessage("(no file)", 0, chromium_log_level).stream() << message;
|
| + }
|
| }
|
|
|
| MojoLogLevel GetMinimumLogLevel() {
|
| @@ -56,17 +62,11 @@ void SetMinimumLogLevel(MojoLogLevel log_level) {
|
| logging::SetMinLogLevel(MojoToChromiumLogLevel(log_level));
|
| }
|
|
|
| -const MojoLogger kDefaultLogger = {
|
| - LogMessage,
|
| - GetMinimumLogLevel,
|
| - SetMinimumLogLevel
|
| -};
|
| -
|
| } // namespace
|
|
|
| -const MojoLogger* GetDefaultLoggerImpl() {
|
| - return &kDefaultLogger;
|
| -}
|
| +const MojoLogger kDefaultLogger = {LogMessage,
|
| + GetMinimumLogLevel,
|
| + SetMinimumLogLevel};
|
|
|
| } // namespace internal
|
| } // namespace mojo
|
|
|