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

Unified Diff: chrome/browser/resources/task_manager/main.js

Issue 8505004: TaskManager: Fix to make format of i18n-content values to be of JavaScriptCase (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed merge conflicts Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/resources/task_manager/main.html ('k') | chrome/browser/ui/webui/task_manager_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/task_manager/main.js
diff --git a/chrome/browser/resources/task_manager/main.js b/chrome/browser/resources/task_manager/main.js
index d2089b31e2695aa7a2a42ca921748db06dfda0b9..5e62234ad338fb0bd26d66edbd0f5a3deb3d8e84 100644
--- a/chrome/browser/resources/task_manager/main.js
+++ b/chrome/browser/resources/task_manager/main.js
@@ -12,21 +12,21 @@ cr.addSingletonGetter(TaskManager);
* @const
*/
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],
- ['cpuUsage', 'CPU_COLUMN', 80, true],
- ['networkUsage', 'NET_COLUMN', 85, true],
- ['processId', 'PROCESS_ID_COLUMN', 100, false],
- ['webCoreImageCacheSize', 'WEBCORE_IMAGE_CACHE_COLUMN', 120, false],
- ['webCoreScriptsCacheSize', 'WEBCORE_SCRIPTS_CACHE_COLUMN', 120, false],
- ['webCoreCSSCacheSize', 'WEBCORE_CSS_CACHE_COLUMN', 120, false],
- ['fps', 'FPS_COLUMN', 50, true],
- ['sqliteMemoryUsed', 'SQLITE_MEMORY_USED_COLUMN', 80, false],
- ['goatsTeleported', 'GOATS_TELEPORTED_COLUMN', 80, false],
- ['v8MemoryAllocatedSize', 'JAVASCRIPT_MEMORY_ALLOCATED_COLUMN', 120, false],
+ ['title', 'pageColumn', 300, true],
+ ['profileName', 'profileNameColumn', 120, false],
+ ['physicalMemory', 'physicalMemColumn', 80, true],
+ ['sharedMemory', 'sharedMemColumn', 80, false],
+ ['privateMemory', 'privateMemColumn', 80, false],
+ ['cpuUsage', 'cpuColumn', 80, true],
+ ['networkUsage', 'netColumn', 85, true],
+ ['processId', 'processIDColumn', 100, false],
+ ['webCoreImageCacheSize', 'webcoreImageCacheColumn', 120, false],
+ ['webCoreScriptsCacheSize', 'webcoreScriptsCacheColumn', 120, false],
+ ['webCoreCSSCacheSize', 'webcoreCSSCacheColumn', 120, false],
+ ['fps', 'fpsColumn', 50, true],
+ ['sqliteMemoryUsed', 'sqliteMemoryUsedColumn', 80, false],
+ ['goatsTeleported', 'goatsTeleportedColumn', 80, false],
+ ['v8MemoryAllocatedSize', 'javascriptMemoryAllocatedColumn', 120, false],
];
var COMMAND_CONTEXTMENU_COLUMN_PREFIX = 'columnContextMenu';
@@ -292,8 +292,8 @@ TaskManager.prototype = {
tm.tableContextMenu_.appendChild(item);
};
- addMenuItem(this, 'inspect', 'INSPECT', "Inspect");
- addMenuItem(this, 'activate', 'ACTIVATE', "Activate");
+ addMenuItem(this, 'inspect', 'inspect', "Inspect");
+ addMenuItem(this, 'activate', 'activate', "Activate");
this.document_.body.appendChild(this.tableContextMenu_);
cr.ui.Menu.decorate(this.tableContextMenu_);
« no previous file with comments | « chrome/browser/resources/task_manager/main.html ('k') | chrome/browser/ui/webui/task_manager_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698