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

Side by Side Diff: chrome/browser/ui/webui/task_manager_handler.cc

Issue 7983059: Add Profile-name column to the WebUI Task Manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/task_manager_handler.h" 5 #include "chrome/browser/ui/webui/task_manager_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 if (column_name == "physicalMemoryValue") { 48 if (column_name == "physicalMemoryValue") {
49 size_t physical_memory; 49 size_t physical_memory;
50 tm->GetPhysicalMemory(i, &physical_memory); 50 tm->GetPhysicalMemory(i, &physical_memory);
51 return Value::CreateDoubleValue(physical_memory); 51 return Value::CreateDoubleValue(physical_memory);
52 } 52 }
53 if (column_name == "icon") 53 if (column_name == "icon")
54 return Value::CreateStringValue( 54 return Value::CreateStringValue(
55 web_ui_util::GetImageDataUrl(tm->GetResourceIcon(i))); 55 web_ui_util::GetImageDataUrl(tm->GetResourceIcon(i)));
56 if (column_name == "title") 56 if (column_name == "title")
57 return Value::CreateStringValue(tm->GetResourceTitle(i)); 57 return Value::CreateStringValue(tm->GetResourceTitle(i));
58 if (column_name == "profileName")
59 return Value::CreateStringValue(tm->GetResourceProfileName(i));
58 if (column_name == "networkUsage") 60 if (column_name == "networkUsage")
59 return Value::CreateStringValue(tm->GetResourceNetworkUsage(i)); 61 return Value::CreateStringValue(tm->GetResourceNetworkUsage(i));
60 if (column_name == "networkUsageValue") 62 if (column_name == "networkUsageValue")
61 return Value::CreateDoubleValue(tm->GetNetworkUsage(i)); 63 return Value::CreateDoubleValue(tm->GetNetworkUsage(i));
62 if (column_name == "webCoreImageCacheSize") 64 if (column_name == "webCoreImageCacheSize")
63 return Value::CreateStringValue(tm->GetResourceWebCoreImageCacheSize(i)); 65 return Value::CreateStringValue(tm->GetResourceWebCoreImageCacheSize(i));
64 if (column_name == "webCoreImageCacheSizeValue") { 66 if (column_name == "webCoreImageCacheSizeValue") {
65 WebKit::WebCache::ResourceTypeStats resource_stats; 67 WebKit::WebCache::ResourceTypeStats resource_stats;
66 tm->GetWebCoreCacheStats(i, &resource_stats); 68 tm->GetWebCoreCacheStats(i, &resource_stats);
67 return Value::CreateDoubleValue(resource_stats.images.size); 69 return Value::CreateDoubleValue(resource_stats.images.size);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 CreateGroupColumnList(tm, "webCoreCSSCacheSize", index, 1, val); 164 CreateGroupColumnList(tm, "webCoreCSSCacheSize", index, 1, val);
163 CreateGroupColumnList(tm, "webCoreCSSCacheSizeValue", index, 1, val); 165 CreateGroupColumnList(tm, "webCoreCSSCacheSizeValue", index, 1, val);
164 CreateGroupColumnList(tm, "sqliteMemoryUsed", index, 1, val); 166 CreateGroupColumnList(tm, "sqliteMemoryUsed", index, 1, val);
165 CreateGroupColumnList(tm, "sqliteMemoryUsedValue", index, 1, val); 167 CreateGroupColumnList(tm, "sqliteMemoryUsedValue", index, 1, val);
166 CreateGroupColumnList(tm, "v8MemoryAllocatedSize", index, 1, val); 168 CreateGroupColumnList(tm, "v8MemoryAllocatedSize", index, 1, val);
167 CreateGroupColumnList(tm, "v8MemoryAllocatedSizeValue", index, 1, val); 169 CreateGroupColumnList(tm, "v8MemoryAllocatedSizeValue", index, 1, val);
168 170
169 // Columns which have some data in each group. 171 // Columns which have some data in each group.
170 CreateGroupColumnList(tm, "icon", index, length, val); 172 CreateGroupColumnList(tm, "icon", index, length, val);
171 CreateGroupColumnList(tm, "title", index, length, val); 173 CreateGroupColumnList(tm, "title", index, length, val);
174 CreateGroupColumnList(tm, "profileName", index, length, val);
172 CreateGroupColumnList(tm, "networkUsage", index, length, val); 175 CreateGroupColumnList(tm, "networkUsage", index, length, val);
173 CreateGroupColumnList(tm, "networkUsageValue", index, length, val); 176 CreateGroupColumnList(tm, "networkUsageValue", index, length, val);
174 CreateGroupColumnList(tm, "fps", index, length, val); 177 CreateGroupColumnList(tm, "fps", index, length, val);
175 CreateGroupColumnList(tm, "fpsValue", index, length, val); 178 CreateGroupColumnList(tm, "fpsValue", index, length, val);
176 CreateGroupColumnList(tm, "goatsTeleported", index, length, val); 179 CreateGroupColumnList(tm, "goatsTeleported", index, length, val);
177 CreateGroupColumnList(tm, "goatsTeleportedValue", index, length, val); 180 CreateGroupColumnList(tm, "goatsTeleportedValue", index, length, val);
178 181
179 return val; 182 return val;
180 } 183 }
181 184
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 } 402 }
400 } 403 }
401 404
402 void TaskManagerHandler::OnGroupRemoved(const int group_start, 405 void TaskManagerHandler::OnGroupRemoved(const int group_start,
403 const int group_length) { 406 const int group_length) {
404 base::FundamentalValue start_value(group_start); 407 base::FundamentalValue start_value(group_start);
405 base::FundamentalValue length_value(group_length); 408 base::FundamentalValue length_value(group_length);
406 if (is_enabled_) 409 if (is_enabled_)
407 web_ui_->CallJavascriptFunction("taskRemoved", start_value, length_value); 410 web_ui_->CallJavascriptFunction("taskRemoved", start_value, length_value);
408 } 411 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/task_manager/main.js ('k') | chrome/browser/ui/webui/task_manager_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698