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

Unified Diff: chrome/browser/ui/webui/task_manager_handler.cc

Issue 8343060: TaskManager: allows referencing task resources from the web ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/task_manager_handler.cc
diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc
index e469272879dfd40e17b1513af1b1578d30d61c72..856179e9610f05f14d99b44b385c473574f02882 100644
--- a/chrome/browser/ui/webui/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager_handler.cc
@@ -26,8 +26,8 @@ namespace {
static Value* CreateColumnValue(const TaskManagerModel* tm,
const std::string column_name,
const int i) {
- if (column_name == "resourceIndex")
- return Value::CreateIntegerValue(i);
+ if (column_name == "uniqueId")
+ return Value::CreateIntegerValue(tm->GetResourceUniqueId(i));
if (column_name == "type")
return Value::CreateStringValue(
TaskManager::Resource::GetResourceTypeAsString(
@@ -178,7 +178,7 @@ static DictionaryValue* CreateTaskGroupValue(const TaskManagerModel* tm,
CreateGroupColumnList(tm, "v8MemoryAllocatedSizeValue", index, 1, val);
// Columns which have some data in each group.
- CreateGroupColumnList(tm, "resourceIndex", index, length, val);
+ CreateGroupColumnList(tm, "uniqueId", index, length, val);
CreateGroupColumnList(tm, "icon", index, length, val);
CreateGroupColumnList(tm, "title", index, length, val);
CreateGroupColumnList(tm, "profileName", index, length, val);
@@ -354,11 +354,19 @@ void TaskManagerHandler::HandleKillProcess(const ListValue* indexes) {
void TaskManagerHandler::HandleInspect(const ListValue* resource_index) {
for (ListValue::const_iterator i = resource_index->begin();
i != resource_index->end(); ++i) {
- int resource_index = parseIndex(*i);
- if (resource_index == -1)
+ int unique_id = parseIndex(*i);
+ if (unique_id == -1)
continue;
- if (model_->CanInspect(resource_index))
- model_->Inspect(resource_index);
+
+ for (int resource_index = 0; resource_index < model_->ResourceCount();
+ ++resource_index) {
+ if (model_->GetResourceUniqueId(resource_index) == unique_id) {
+ if (model_->CanInspect(resource_index))
+ model_->Inspect(resource_index);
+ break;
+ }
+ }
+
break;
}
}
« chrome/browser/task_manager/task_manager.h ('K') | « chrome/browser/task_manager/task_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698