OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "remoting/host/host_event_logger.h" | 5 #include "remoting/host/host_event_logger.h" |
6 | 6 |
| 7 #include <stddef.h> |
7 #include <windows.h> | 8 #include <windows.h> |
8 #include <stddef.h> | 9 |
| 10 #include <memory> |
9 #include <string> | 11 #include <string> |
10 #include <vector> | 12 #include <vector> |
11 | 13 |
12 #include "base/macros.h" | 14 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/ptr_util.h" |
14 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
15 #include "base/strings/string16.h" | 17 #include "base/strings/string16.h" |
16 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
17 #include "net/base/ip_endpoint.h" | 19 #include "net/base/ip_endpoint.h" |
18 #include "remoting/host/host_status_monitor.h" | 20 #include "remoting/host/host_status_monitor.h" |
19 #include "remoting/host/host_status_observer.h" | 21 #include "remoting/host/host_status_observer.h" |
20 #include "remoting/host/remoting_host_messages.h" | 22 #include "remoting/host/remoting_host_messages.h" |
21 #include "remoting/protocol/transport.h" | 23 #include "remoting/protocol/transport.h" |
22 | 24 |
23 namespace remoting { | 25 namespace remoting { |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 143 |
142 void HostEventLoggerWin::LogString(WORD type, | 144 void HostEventLoggerWin::LogString(WORD type, |
143 DWORD event_id, | 145 DWORD event_id, |
144 const std::string& string) { | 146 const std::string& string) { |
145 std::vector<std::string> strings; | 147 std::vector<std::string> strings; |
146 strings.push_back(string); | 148 strings.push_back(string); |
147 Log(type, event_id, strings); | 149 Log(type, event_id, strings); |
148 } | 150 } |
149 | 151 |
150 // static | 152 // static |
151 scoped_ptr<HostEventLogger> HostEventLogger::Create( | 153 std::unique_ptr<HostEventLogger> HostEventLogger::Create( |
152 base::WeakPtr<HostStatusMonitor> monitor, | 154 base::WeakPtr<HostStatusMonitor> monitor, |
153 const std::string& application_name) { | 155 const std::string& application_name) { |
154 return make_scoped_ptr(new HostEventLoggerWin(monitor, application_name)); | 156 return base::WrapUnique(new HostEventLoggerWin(monitor, application_name)); |
155 } | 157 } |
156 | 158 |
157 } // namespace remoting | 159 } // namespace remoting |
OLD | NEW |