OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/browser/browser_child_process_host.h" | 5 #include "content/browser/browser_child_process_host.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
13 #include "base/process_util.h" | 13 #include "base/process_util.h" |
14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "content/browser/profiler_message_filter.h" |
16 #include "content/browser/renderer_host/resource_message_filter.h" | 17 #include "content/browser/renderer_host/resource_message_filter.h" |
17 #include "content/browser/trace_message_filter.h" | 18 #include "content/browser/trace_message_filter.h" |
18 #include "content/common/plugin_messages.h" | 19 #include "content/common/plugin_messages.h" |
19 #include "content/common/process_watcher.h" | 20 #include "content/common/process_watcher.h" |
20 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
21 #include "content/public/browser/content_browser_client.h" | 22 #include "content/public/browser/content_browser_client.h" |
22 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
23 #include "content/public/browser/notification_types.h" | 24 #include "content/public/browser/notification_types.h" |
24 #include "content/public/common/content_switches.h" | 25 #include "content/public/common/content_switches.h" |
25 #include "content/public/common/result_codes.h" | 26 #include "content/public/common/result_codes.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 63 |
63 BrowserChildProcessHost::BrowserChildProcessHost( | 64 BrowserChildProcessHost::BrowserChildProcessHost( |
64 ChildProcessInfo::ProcessType type) | 65 ChildProcessInfo::ProcessType type) |
65 : ChildProcessInfo(type, -1), | 66 : ChildProcessInfo(type, -1), |
66 ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)), | 67 ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)), |
67 #if !defined(OS_WIN) | 68 #if !defined(OS_WIN) |
68 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), | 69 ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), |
69 #endif | 70 #endif |
70 disconnect_was_alive_(false) { | 71 disconnect_was_alive_(false) { |
71 AddFilter(new TraceMessageFilter); | 72 AddFilter(new TraceMessageFilter); |
| 73 AddFilter(new ProfilerMessageFilter); |
72 | 74 |
73 g_child_process_list.Get().push_back(this); | 75 g_child_process_list.Get().push_back(this); |
74 } | 76 } |
75 | 77 |
76 BrowserChildProcessHost::~BrowserChildProcessHost() { | 78 BrowserChildProcessHost::~BrowserChildProcessHost() { |
77 g_child_process_list.Get().remove(this); | 79 g_child_process_list.Get().remove(this); |
78 } | 80 } |
79 | 81 |
80 // static | 82 // static |
81 void BrowserChildProcessHost::TerminateAll() { | 83 void BrowserChildProcessHost::TerminateAll() { |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 | 277 |
276 return *iterator_; | 278 return *iterator_; |
277 } while (true); | 279 } while (true); |
278 | 280 |
279 return NULL; | 281 return NULL; |
280 } | 282 } |
281 | 283 |
282 bool BrowserChildProcessHost::Iterator::Done() { | 284 bool BrowserChildProcessHost::Iterator::Done() { |
283 return iterator_ == g_child_process_list.Get().end(); | 285 return iterator_ == g_child_process_list.Get().end(); |
284 } | 286 } |
OLD | NEW |