diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 01:35:20 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 01:35:20 +0000 |
| commit | 79e1409f81bf5ce29f69acfaae15f0ff057cb321 (patch) | |
| tree | ea558c588a4dfbd2b799a093a0ee6cafc6bf9605 | |
| parent | 7bc6cc9d4103d3a2087c719f18347f79b66bedf0 (diff) | |
| download | chromium_src-79e1409f81bf5ce29f69acfaae15f0ff057cb321.zip chromium_src-79e1409f81bf5ce29f69acfaae15f0ff057cb321.tar.gz chromium_src-79e1409f81bf5ce29f69acfaae15f0ff057cb321.tar.bz2 | |
Add Profile-name column to the WebUI Task Manager
This column is hideen by default.
BUG=97571
TEST=manual, pass trybot
Review URL: http://codereview.chromium.org/7983059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102686 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/task_manager/main.js | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/task_manager_handler.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/task_manager_ui.cc | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/resources/task_manager/main.js b/chrome/browser/resources/task_manager/main.js index cebb637f..8d58f41 100644 --- a/chrome/browser/resources/task_manager/main.js +++ b/chrome/browser/resources/task_manager/main.js @@ -13,6 +13,7 @@ cr.addSingletonGetter(TaskManager); */ var DEFAULT_COLUMNS = [ ['title', 'PAGE_COLUMN', 300, true], + ['profileName', 'PROFILE_NAME_COLUMN', 120, false], ['physicalMemory', 'PHYSICAL_MEM_COLUMN', 80, true], ['sharedMemory', 'SHARED_MEM_COLUMN', 80, false], ['privateMemory', 'PRIVATE_MEM_COLUMN', 80, false], diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc index 248fdb3..c523371 100644 --- a/chrome/browser/ui/webui/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager_handler.cc @@ -55,6 +55,8 @@ static Value* CreateColumnValue(const TaskManagerModel* tm, web_ui_util::GetImageDataUrl(tm->GetResourceIcon(i))); if (column_name == "title") return Value::CreateStringValue(tm->GetResourceTitle(i)); + if (column_name == "profileName") + return Value::CreateStringValue(tm->GetResourceProfileName(i)); if (column_name == "networkUsage") return Value::CreateStringValue(tm->GetResourceNetworkUsage(i)); if (column_name == "networkUsageValue") @@ -169,6 +171,7 @@ static DictionaryValue* CreateTaskGroupValue(const TaskManagerModel* tm, // Columns which have some data in each group. CreateGroupColumnList(tm, "icon", index, length, val); CreateGroupColumnList(tm, "title", index, length, val); + CreateGroupColumnList(tm, "profileName", index, length, val); CreateGroupColumnList(tm, "networkUsage", index, length, val); CreateGroupColumnList(tm, "networkUsageValue", index, length, val); CreateGroupColumnList(tm, "fps", index, length, val); diff --git a/chrome/browser/ui/webui/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager_ui.cc index 3ad6c26..78cfefd 100644 --- a/chrome/browser/ui/webui/task_manager_ui.cc +++ b/chrome/browser/ui/webui/task_manager_ui.cc @@ -36,6 +36,7 @@ ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { SET_LOCALIZED_STRING(KILL_CHROMEOS); SET_LOCALIZED_STRING(PROCESS_ID_COLUMN); SET_LOCALIZED_STRING(PAGE_COLUMN); + SET_LOCALIZED_STRING(PROFILE_NAME_COLUMN); SET_LOCALIZED_STRING(NET_COLUMN); SET_LOCALIZED_STRING(CPU_COLUMN); SET_LOCALIZED_STRING(PHYSICAL_MEM_COLUMN); |