diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:42:23 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:42:23 +0000 |
| commit | 443b80e00142dab08385eba06fcea79c96bbee6b (patch) | |
| tree | 157caafda0fc699ff453d0d9666d19f2eeff8869 /chrome/browser/task_manager | |
| parent | 458a4362fecfe99bd7bc7e9d918a50fc653b4519 (diff) | |
| download | chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.zip chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.tar.gz chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.tar.bz2 | |
This adds some plumbing for propagating the status and error code of a renderer process that went away so that we can tell at the UI level what happened to the tab: did it crash, or was it killed by the OOM killer (or some other reason). This is in preparation for implementing a new UI for when a process is killed by the OOM on ChromeOS which handles it differently from a crash.
Most of the changes are modifications of the argument list to include a status and error code for the exited process, but in addition the following was done:
- Changed the name of DidProcessCrash to GetTerminationStatus.
- Added TerminationStatus enum in process_util.h, so it can be used as the status returned by GetTerminationStatus.
- Improved process_util_unittest to actually test for crashing and terminated processes on all platforms.
- Added a new notification for renderers that were killed.
- Added error code information to crash notification.
- Added status and error code information to renderer IPC message for RenderViewGone.
- Added a UMA histogram count for number of renderer kills.
BUG=http://crosbug.com/8505
TEST=ran new unit test. Test passes on try servers.
Review URL: http://codereview.chromium.org/5172009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 2dc5029..da19fda 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -26,6 +26,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "chrome/common/pref_names.h" +#include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" @@ -944,7 +945,7 @@ void TaskManager::KillProcess(int index) { base::ProcessHandle process = model_->GetResourceProcessHandle(index); DCHECK(process); if (process != base::GetCurrentProcessHandle()) - base::KillProcess(process, base::PROCESS_END_KILLED_BY_USER, false); + base::KillProcess(process, ResultCodes::KILLED, false); } void TaskManager::ActivateProcess(int index) { |