| 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 #ifndef CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ | 5 #ifndef CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ |
| 6 #define CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ | 6 #define CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
| 13 #include "base/macros.h" |
| 14 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/memory/ref_counted.h" | |
| 15 #include "base/threading/non_thread_safe.h" | 16 #include "base/threading/non_thread_safe.h" |
| 16 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
| 17 #include "chromeos/chromeos_export.h" | 18 #include "chromeos/chromeos_export.h" |
| 18 #include "chromeos/process_proxy/process_proxy.h" | 19 #include "chromeos/process_proxy/process_proxy.h" |
| 19 | 20 |
| 20 namespace chromeos { | 21 namespace chromeos { |
| 21 | 22 |
| 22 typedef base::Callback<void(pid_t, const std::string&, const std::string&)> | 23 typedef base::Callback<void(pid_t, const std::string&, const std::string&)> |
| 23 ProcessOutputCallbackWithPid; | 24 ProcessOutputCallbackWithPid; |
| 24 | 25 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 std::map<pid_t, ProcessProxyInfo> proxy_map_; | 74 std::map<pid_t, ProcessProxyInfo> proxy_map_; |
| 74 | 75 |
| 75 scoped_ptr<base::Thread> watcher_thread_; | 76 scoped_ptr<base::Thread> watcher_thread_; |
| 76 | 77 |
| 77 DISALLOW_COPY_AND_ASSIGN(ProcessProxyRegistry); | 78 DISALLOW_COPY_AND_ASSIGN(ProcessProxyRegistry); |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 } // namespace chromeos | 81 } // namespace chromeos |
| 81 | 82 |
| 82 #endif // CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ | 83 #endif // CHROMEOS_PROCESS_PROXY_PROCESS_PROXY_REGISTRY_H_ |
| OLD | NEW |