| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_SIGNALING_LOG_TO_SERVER_H_ | 5 #ifndef REMOTING_SIGNALING_LOG_TO_SERVER_H_ |
| 6 #define REMOTING_SIGNALING_LOG_TO_SERVER_H_ | 6 #define REMOTING_SIGNALING_LOG_TO_SERVER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/macros.h" |
| 12 #include "base/threading/non_thread_safe.h" | 13 #include "base/threading/non_thread_safe.h" |
| 13 #include "remoting/signaling/server_log_entry.h" | 14 #include "remoting/signaling/server_log_entry.h" |
| 14 #include "remoting/signaling/signal_strategy.h" | 15 #include "remoting/signaling/signal_strategy.h" |
| 15 | 16 |
| 16 namespace buzz { | 17 namespace buzz { |
| 17 class XmlElement; | 18 class XmlElement; |
| 18 } // namespace buzz | 19 } // namespace buzz |
| 19 | 20 |
| 20 namespace remoting { | 21 namespace remoting { |
| 21 | 22 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 49 std::string directory_bot_jid_; | 50 std::string directory_bot_jid_; |
| 50 | 51 |
| 51 std::deque<ServerLogEntry> pending_entries_; | 52 std::deque<ServerLogEntry> pending_entries_; |
| 52 | 53 |
| 53 DISALLOW_COPY_AND_ASSIGN(LogToServer); | 54 DISALLOW_COPY_AND_ASSIGN(LogToServer); |
| 54 }; | 55 }; |
| 55 | 56 |
| 56 } // namespace remoting | 57 } // namespace remoting |
| 57 | 58 |
| 58 #endif // REMOTING_SIGNALING_LOG_TO_SERVER_H_ | 59 #endif // REMOTING_SIGNALING_LOG_TO_SERVER_H_ |
| OLD | NEW |