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

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

Issue 102073008: Allow multiple NaCl modules to be debugged. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/task_manager/task_manager_handler.cc
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
index 98ecf461af755cc5b873926569f287cf05369540..2ff2306ebf13d55edc2e131f12ac6cc1d365bd90 100644
--- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc
@@ -51,6 +51,7 @@ const ColumnType kColumnsList[] = {
{"networkUsage", true, true},
{"fps", true, true},
{"videoMemory", true, false},
+ {"naclDebugStubProt", true, true},
{"goatsTeleported", true, true},
{"canInspect", false, true},
{"canActivate", false, true}
@@ -397,8 +398,12 @@ base::Value* TaskManagerHandler::CreateColumnValue(
}
if (column_name == "goatsTeleported")
return Value::CreateStringValue(model_->GetResourceGoatsTeleported(i));
+ if (column_name == "naclDebugStubPort")
+ return Value::CreateStringValue(model_->GetResourceNaClDebugStubPort(i));
if (column_name == "goatsTeleportedValue")
return Value::CreateIntegerValue(model_->GetGoatsTeleported(i));
+ if (column_name == "naclDebugStubPortValue")
+ return Value::CreateIntegerValue(model_->GetNaClDebugStubPort(i));
if (column_name == "v8MemoryAllocatedSize") {
return Value::CreateStringValue(
model_->GetResourceV8MemoryAllocatedSize(i));

Powered by Google App Engine
This is Rietveld 408576698