OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef REMOTING_HOST_NATIVE_MESSAGIN_LOG_HANDLER_H_ | 5 #ifndef REMOTING_HOST_NATIVE_MESSAGIN_LOG_HANDLER_H_ |
6 #define REMOTING_HOST_NATIVE_MESSAGIN_LOG_HANDLER_H_ | 6 #define REMOTING_HOST_NATIVE_MESSAGIN_LOG_HANDLER_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/callback.h" | 12 #include "base/callback.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
13 #include "base/values.h" | 14 #include "base/values.h" |
14 | 15 |
15 namespace remoting { | 16 namespace remoting { |
16 | 17 |
17 // Helper class for logging::SetLogMessageHandler to deliver log messages to | 18 // Helper class for logging::SetLogMessageHandler to deliver log messages to |
18 // a consistent thread in a thread-safe way and in a format suitable for sending | 19 // a consistent thread in a thread-safe way and in a format suitable for sending |
19 // over a Native Messaging channel. | 20 // over a Native Messaging channel. |
20 class LogMessageHandler { | 21 class LogMessageHandler { |
21 public: | 22 public: |
22 typedef base::Callback<void (scoped_ptr<base::Value> message)> Delegate; | 23 typedef base::Callback<void(std::unique_ptr<base::Value> message)> Delegate; |
23 | 24 |
24 explicit LogMessageHandler(const Delegate& delegate); | 25 explicit LogMessageHandler(const Delegate& delegate); |
25 ~LogMessageHandler(); | 26 ~LogMessageHandler(); |
26 | 27 |
27 static const char* kDebugMessageTypeName; | 28 static const char* kDebugMessageTypeName; |
28 | 29 |
29 private: | 30 private: |
30 static bool OnLogMessage( | 31 static bool OnLogMessage( |
31 int severity, const char* file, int line, | 32 int severity, const char* file, int line, |
32 size_t message_start, const std::string& str); | 33 size_t message_start, const std::string& str); |
33 void PostLogMessageToCorrectThread( | 34 void PostLogMessageToCorrectThread( |
34 int severity, const char* file, int line, | 35 int severity, const char* file, int line, |
35 size_t message_start, const std::string& str); | 36 size_t message_start, const std::string& str); |
36 void SendLogMessageToClient( | 37 void SendLogMessageToClient( |
37 int severity, const char* file, int line, | 38 int severity, const char* file, int line, |
38 size_t message_start, const std::string& str); | 39 size_t message_start, const std::string& str); |
39 | 40 |
40 Delegate delegate_; | 41 Delegate delegate_; |
41 bool suppress_logging_; | 42 bool suppress_logging_; |
42 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; | 43 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; |
43 logging::LogMessageHandlerFunction previous_log_message_handler_; | 44 logging::LogMessageHandlerFunction previous_log_message_handler_; |
44 base::WeakPtrFactory<LogMessageHandler> weak_ptr_factory_; | 45 base::WeakPtrFactory<LogMessageHandler> weak_ptr_factory_; |
45 }; | 46 }; |
46 | 47 |
47 } // namespace remoting | 48 } // namespace remoting |
48 | 49 |
49 #endif | 50 #endif |
OLD | NEW |