OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include <windows.h> | 5 #include <windows.h> |
6 #include <sddl.h> | 6 #include <sddl.h> |
7 | 7 |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
13 #include "base/callback_helpers.h" | 13 #include "base/callback_helpers.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/environment.h" | 15 #include "base/environment.h" |
16 #include "base/file_version_info.h" | 16 #include "base/file_version_info.h" |
17 #include "base/files/file_path.h" | 17 #include "base/files/file_path.h" |
18 #include "base/logging_win.h" | 18 #include "base/logging_win.h" |
19 #include "base/macros.h" | 19 #include "base/macros.h" |
20 #include "base/memory/ref_counted.h" | 20 #include "base/memory/ref_counted.h" |
21 #include "base/process/process.h" | 21 #include "base/process/process.h" |
22 #include "base/run_loop.h" | 22 #include "base/run_loop.h" |
23 #include "base/sequenced_task_runner.h" | 23 #include "base/sequenced_task_runner.h" |
24 #include "base/single_thread_task_runner.h" | 24 #include "base/single_thread_task_runner.h" |
25 #include "base/strings/string16.h" | 25 #include "base/strings/string16.h" |
26 #include "base/strings/string_number_conversions.h" | 26 #include "base/strings/string_number_conversions.h" |
27 #include "base/strings/string_piece.h" | 27 #include "base/strings/string_piece.h" |
28 #include "base/strings/utf_string_conversions.h" | 28 #include "base/strings/utf_string_conversions.h" |
29 #include "base/synchronization/waitable_event.h" | 29 #include "base/synchronization/waitable_event.h" |
| 30 #include "base/threading/platform_thread.h" |
30 #include "base/threading/thread.h" | 31 #include "base/threading/thread.h" |
31 #include "base/threading/thread_task_runner_handle.h" | 32 #include "base/threading/thread_task_runner_handle.h" |
32 #include "base/time/time.h" | 33 #include "base/time/time.h" |
33 #include "base/win/scoped_handle.h" | 34 #include "base/win/scoped_handle.h" |
34 #include "base/win/win_util.h" | 35 #include "base/win/win_util.h" |
35 | 36 |
36 #include "chrome/chrome_watcher/chrome_watcher_main_api.h" | 37 #include "chrome/chrome_watcher/chrome_watcher_main_api.h" |
37 #include "chrome/chrome_watcher/kasko_util.h" | 38 #include "chrome/chrome_watcher/kasko_util.h" |
38 #include "chrome/installer/util/util_constants.h" | 39 #include "chrome/installer/util/util_constants.h" |
39 #include "components/browser_watcher/endsession_watcher_window_win.h" | 40 #include "components/browser_watcher/endsession_watcher_window_win.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 // Only activate hang reports for the canary channel. | 225 // Only activate hang reports for the canary channel. |
225 if (launched_kasko && | 226 if (launched_kasko && |
226 base::StringPiece16(channel_name) == installer::kChromeChannelCanary) { | 227 base::StringPiece16(channel_name) == installer::kChromeChannelCanary) { |
227 on_hung_callback = base::Bind(&DumpHungProcess, main_thread_id, | 228 on_hung_callback = base::Bind(&DumpHungProcess, main_thread_id, |
228 channel_name, L"hung-process"); | 229 channel_name, L"hung-process"); |
229 } | 230 } |
230 #endif // BUILDFLAG(ENABLE_KASKO_HANG_REPORTS) | 231 #endif // BUILDFLAG(ENABLE_KASKO_HANG_REPORTS) |
231 #endif // BUILDFLAG(ENABLE_KASKO) | 232 #endif // BUILDFLAG(ENABLE_KASKO) |
232 | 233 |
233 // Run a UI message loop on the main thread. | 234 // Run a UI message loop on the main thread. |
| 235 base::PlatformThread::SetName("WatcherMainThread"); |
234 base::MessageLoop msg_loop(base::MessageLoop::TYPE_UI); | 236 base::MessageLoop msg_loop(base::MessageLoop::TYPE_UI); |
235 msg_loop.set_thread_name("WatcherMainThread"); | |
236 | 237 |
237 base::RunLoop run_loop; | 238 base::RunLoop run_loop; |
238 BrowserMonitor monitor(registry_path, &run_loop); | 239 BrowserMonitor monitor(registry_path, &run_loop); |
239 if (!monitor.StartWatching(process.Duplicate(), | 240 if (!monitor.StartWatching(process.Duplicate(), |
240 std::move(on_initialized_event))) { | 241 std::move(on_initialized_event))) { |
241 return 1; | 242 return 1; |
242 } | 243 } |
243 | 244 |
244 { | 245 { |
245 // Scoped to force |hang_monitor| destruction before Kasko is shut down. | 246 // Scoped to force |hang_monitor| destruction before Kasko is shut down. |
(...skipping 13 matching lines...) Expand all Loading... |
259 | 260 |
260 // Wind logging down. | 261 // Wind logging down. |
261 logging::LogEventProvider::Uninitialize(); | 262 logging::LogEventProvider::Uninitialize(); |
262 | 263 |
263 return 0; | 264 return 0; |
264 } | 265 } |
265 | 266 |
266 static_assert( | 267 static_assert( |
267 std::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value, | 268 std::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value, |
268 "WatcherMain() has wrong type"); | 269 "WatcherMain() has wrong type"); |
OLD | NEW |