Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: chrome/browser/task_manager/task_manager.cc

Issue 5172009: This adds some plumbing for propagating the reason for a renderer's death (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renaming PROCESS_END_* to EXIT_CODE_* Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 // killing a process that manages several pages. 937 // killing a process that manages several pages.
938 return index < model_->ResourceCount() && 938 return index < model_->ResourceCount() &&
939 model_->GetResourceProcessHandle(index) == 939 model_->GetResourceProcessHandle(index) ==
940 base::GetCurrentProcessHandle(); 940 base::GetCurrentProcessHandle();
941 } 941 }
942 942
943 void TaskManager::KillProcess(int index) { 943 void TaskManager::KillProcess(int index) {
944 base::ProcessHandle process = model_->GetResourceProcessHandle(index); 944 base::ProcessHandle process = model_->GetResourceProcessHandle(index);
945 DCHECK(process); 945 DCHECK(process);
946 if (process != base::GetCurrentProcessHandle()) 946 if (process != base::GetCurrentProcessHandle())
947 base::KillProcess(process, base::PROCESS_END_KILLED_BY_USER, false); 947 base::KillProcess(process, base::EXIT_CODE_PROCESS_WAS_KILLED, false);
948 } 948 }
949 949
950 void TaskManager::ActivateProcess(int index) { 950 void TaskManager::ActivateProcess(int index) {
951 // GetResourceTabContents returns a pointer to the relevant tab contents for 951 // GetResourceTabContents returns a pointer to the relevant tab contents for
952 // the resource. If the index doesn't correspond to a Tab (i.e. refers to 952 // the resource. If the index doesn't correspond to a Tab (i.e. refers to
953 // the Browser process or a plugin), GetTabContents will return NULL. 953 // the Browser process or a plugin), GetTabContents will return NULL.
954 TabContents* chosen_tab_contents = model_->GetResourceTabContents(index); 954 TabContents* chosen_tab_contents = model_->GetResourceTabContents(index);
955 if (chosen_tab_contents) 955 if (chosen_tab_contents)
956 chosen_tab_contents->Activate(); 956 chosen_tab_contents->Activate();
957 } 957 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 MetricsMap::const_iterator iter = metrics_map_.find(handle); 1024 MetricsMap::const_iterator iter = metrics_map_.find(handle);
1025 if (iter == metrics_map_.end()) 1025 if (iter == metrics_map_.end())
1026 return false; 1026 return false;
1027 1027
1028 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second)) 1028 if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
1029 return false; 1029 return false;
1030 1030
1031 memory_usage_map_.insert(std::make_pair(handle, *usage)); 1031 memory_usage_map_.insert(std::make_pair(handle, *usage));
1032 return true; 1032 return true;
1033 } 1033 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698