WebUI Task manager: prevent to kill the wrong process or none

chrome/browser/ui/webui/task_manager_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/task_manager_handler.h"
 
 #include <algorithm>
 #include <functional>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 289 matching lines @@
   std::vector<int>::iterator it_last = it_first + length - 1;
   resource_to_group_table_.erase(it_first, it_last);
 
   OnGroupRemoved(group_start, group_end - group_start + 1);
 }
 
 void TaskManagerHandler::Init() {
 }
 
 void TaskManagerHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback("killProcess",
-      base::Bind(&TaskManagerHandler::HandleKillProcess,
+  web_ui_->RegisterMessageCallback("killProcesses",
+      base::Bind(&TaskManagerHandler::HandleKillProcesses,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("inspect",
       base::Bind(&TaskManagerHandler::HandleInspect,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("activatePage",
       base::Bind(&TaskManagerHandler::HandleActivatePage,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openAboutMemory",
       base::Bind(&TaskManagerHandler::OpenAboutMemory,
                  base::Unretained(this)));
@@ skipping 12 matching lines @@
   if (value->GetAsString(&string16_index)) {
     base::StringToInt(string16_index, &index);
   } else if (value->GetAsDouble(&double_index)) {
     index = static_cast<int>(double_index);
   } else {
     value->GetAsInteger(&index);
   }
   return index;
 }
 
-void TaskManagerHandler::HandleKillProcess(const ListValue* indexes) {
-  for (ListValue::const_iterator i = indexes->begin();
-       i != indexes->end(); i++) {
-    int index = parseIndex(*i);
-    if (index == -1)
-      continue;
-
-    int resource_index = model_->GetResourceIndexForGroup(index, 0);
+void TaskManagerHandler::HandleKillProcesses(const ListValue* unique_ids) {
+  for (ListValue::const_iterator i = unique_ids->begin();
+       i != unique_ids->end(); ++i) {
+    int unique_id = parseIndex(*i);
+    int resource_index = model_->GetResourceIndexByUniqueId(unique_id);
     if (resource_index == -1)
       continue;
 
-    LOG(INFO) << "kill PID:" << model_->GetResourceProcessId(resource_index);
     task_manager_->KillProcess(resource_index);
   }
 }
 
-void TaskManagerHandler::HandleActivatePage(const ListValue* resource_index) {
-  for (ListValue::const_iterator i = resource_index->begin();
-       i != resource_index->end(); ++i) {
+void TaskManagerHandler::HandleActivatePage(const ListValue* unique_ids) {
+  for (ListValue::const_iterator i = unique_ids->begin();
+       i != unique_ids->end(); ++i) {
     int unique_id = parseIndex(*i);
-    if (unique_id == -1)
+    int resource_index = model_->GetResourceIndexByUniqueId(unique_id);
+    if (resource_index == -1)
       continue;
 
-    for (int resource_index = 0; resource_index < model_->ResourceCount();
-         ++resource_index) {
-      if (model_->GetResourceUniqueId(resource_index) == unique_id) {
-        task_manager_->ActivateProcess(resource_index);
-        break;
-      }
-    }
-
+    task_manager_->ActivateProcess(resource_index);
     break;
   }
 }
 
-void TaskManagerHandler::HandleInspect(const ListValue* resource_index) {
-  for (ListValue::const_iterator i = resource_index->begin();
-       i != resource_index->end(); ++i) {
+void TaskManagerHandler::HandleInspect(const ListValue* unique_ids) {
+  for (ListValue::const_iterator i = unique_ids->begin();
+       i != unique_ids->end(); ++i) {
     int unique_id = parseIndex(*i);
-    if (unique_id == -1)
+    int resource_index = model_->GetResourceIndexByUniqueId(unique_id);
+    if (resource_index == -1)
       continue;
 
-    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;
-      }
-    }
-
+    if (model_->CanInspect(resource_index))
+      model_->Inspect(resource_index);
     break;
   }
 }
 
 void TaskManagerHandler::DisableTaskManager(const ListValue* indexes) {
   if (!is_enabled_)
     return;
 
   is_enabled_ = false;
   model_->StopUpdating();
@@ skipping 78 matching lines @@
   }
 }
 
 void TaskManagerHandler::OnGroupRemoved(const int group_start,
                                         const int group_length) {
   base::FundamentalValue start_value(group_start);
   base::FundamentalValue length_value(group_length);
   if (is_enabled_ && is_alive())
     web_ui_->CallJavascriptFunction("taskRemoved", start_value, length_value);
 }