Skip to content

GitLab

T
tangled
Commit dca90f96 authored by qghc36@motorola.com's avatar qghc36@motorola.com
Browse files
Options

TaskManager: Fix to make format of i18n-content values to be of JavaScriptCase. 

http://www.chromium.org/developers/web-development-style-guide

BUG=103515
TEST=None


Review URL: http://codereview.chromium.org/8505004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109830 0039d316-1c4b-4281-b951-d872f2087c98
parent 0122d38b
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 47 deletions
chrome/browser/resources/task_manager/main.html
View file @ dca90f96
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<html i18n-values="dir:textdirection;"> <html i18n-values="dir:textdirection;">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title i18n-content="TITLE"></title> <title i18n-content="title"></title>
<script src="chrome://tasks/includes.js"></script> <script src="chrome://tasks/includes.js"></script>
<script src="chrome://tasks/main.js"></script> <script src="chrome://tasks/main.js"></script>
<script src="chrome://tasks/strings.js"></script> <script src="chrome://tasks/strings.js"></script>
<link rel="stylesheet" href="task_manager.css"> <link rel="stylesheet" href="task_manager.css">
</head> </head>
<body> <body>
<div class="dialog-title" i18n-content="TITLE" <div class="dialog-title" i18n-content="title"
visibleif='this.opt_.isShowTitle'></div> visibleif='this.opt_.isShowTitle'></div>
<div class="dialog-body"> <div class="dialog-body">
<div class="list-container"> <div class="list-container">
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
</div> </div>
<div class="dialog-footer"> <div class="dialog-footer">
<div class="footer-left-container"> <div class="footer-left-container">
<a href="#" id="about-memory-link" i18n-content="ABOUT_MEMORY_LINK"></a> <a href="#" id="about-memory-link" i18n-content="aboutMemoryLink"></a>
</div> </div>
<div class="footer-right-container"> <div class="footer-right-container">
<button id="kill-process" <button id="kill-process"
i18n-content="KILL_CHROMEOS" disabled></button> i18n-content="killChromeOS" disabled></button>
<button id="close-window" i18n-content="CLOSE_WINDOW" <button id="close-window" i18n-content="closeWindow"
visibleif='this.opt_.isShowCloseButton'></button> visibleif='this.opt_.isShowCloseButton'></button>
</div> </div>
</div> </div>
......
chrome/browser/resources/task_manager/main.js
View file @ dca90f96
...@@ -12,21 +12,21 @@ cr.addSingletonGetter(TaskManager); ...@@ -12,21 +12,21 @@ cr.addSingletonGetter(TaskManager);
* @const * @const
*/ */
var DEFAULT_COLUMNS = [ var DEFAULT_COLUMNS = [
['title', 'PAGE_COLUMN', 300, true], ['title', 'pageColumn', 300, true],
['profileName', 'PROFILE_NAME_COLUMN', 120, false], ['profileName', 'profileNameColumn', 120, false],
['physicalMemory', 'PHYSICAL_MEM_COLUMN', 80, true], ['physicalMemory', 'physicalMemColumn', 80, true],
['sharedMemory', 'SHARED_MEM_COLUMN', 80, false], ['sharedMemory', 'sharedMemColumn', 80, false],
['privateMemory', 'PRIVATE_MEM_COLUMN', 80, false], ['privateMemory', 'privateMemColumn', 80, false],
['cpuUsage', 'CPU_COLUMN', 80, true], ['cpuUsage', 'cpuColumn', 80, true],
['networkUsage', 'NET_COLUMN', 85, true], ['networkUsage', 'netColumn', 85, true],
['processId', 'PROCESS_ID_COLUMN', 100, false], ['processId', 'processIDColumn', 100, false],
['webCoreImageCacheSize', 'WEBCORE_IMAGE_CACHE_COLUMN', 120, false], ['webCoreImageCacheSize', 'webcoreImageCacheColumn', 120, false],
['webCoreScriptsCacheSize', 'WEBCORE_SCRIPTS_CACHE_COLUMN', 120, false], ['webCoreScriptsCacheSize', 'webcoreScriptsCacheColumn', 120, false],
['webCoreCSSCacheSize', 'WEBCORE_CSS_CACHE_COLUMN', 120, false], ['webCoreCSSCacheSize', 'webcoreCSSCacheColumn', 120, false],
['fps', 'FPS_COLUMN', 50, true], ['fps', 'fpsColumn', 50, true],
['sqliteMemoryUsed', 'SQLITE_MEMORY_USED_COLUMN', 80, false], ['sqliteMemoryUsed', 'sqliteMemoryUsedColumn', 80, false],
['goatsTeleported', 'GOATS_TELEPORTED_COLUMN', 80, false], ['goatsTeleported', 'goatsTeleportedColumn', 80, false],
['v8MemoryAllocatedSize', 'JAVASCRIPT_MEMORY_ALLOCATED_COLUMN', 120, false], ['v8MemoryAllocatedSize', 'javascriptMemoryAllocatedColumn', 120, false],
]; ];
var COMMAND_CONTEXTMENU_COLUMN_PREFIX = 'columnContextMenu'; var COMMAND_CONTEXTMENU_COLUMN_PREFIX = 'columnContextMenu';
...@@ -292,8 +292,8 @@ TaskManager.prototype = { ...@@ -292,8 +292,8 @@ TaskManager.prototype = {
tm.tableContextMenu_.appendChild(item); tm.tableContextMenu_.appendChild(item);
}; };
addMenuItem(this, 'inspect', 'INSPECT', "Inspect"); addMenuItem(this, 'inspect', 'inspect', "Inspect");
addMenuItem(this, 'activate', 'ACTIVATE', "Activate"); addMenuItem(this, 'activate', 'activate', "Activate");
this.document_.body.appendChild(this.tableContextMenu_); this.document_.body.appendChild(this.tableContextMenu_);
cr.ui.Menu.decorate(this.tableContextMenu_); cr.ui.Menu.decorate(this.tableContextMenu_);
......
chrome/browser/ui/webui/task_manager_ui.cc
View file @ dca90f96
...@@ -21,35 +21,44 @@ ...@@ -21,35 +21,44 @@
namespace { namespace {
// Convenience macro for AddLocalizedString() method.
#define SET_LOCALIZED_STRING(ID) \
source->AddLocalizedString(#ID, IDS_TASK_MANAGER_##ID)
ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() {
ChromeWebUIDataSource* source = ChromeWebUIDataSource* source =
new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost); new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost);
source->AddLocalizedString("CLOSE_WINDOW", IDS_CLOSE); source->AddLocalizedString("closeWindow", IDS_CLOSE);
SET_LOCALIZED_STRING(TITLE); source->AddLocalizedString("title",IDS_TASK_MANAGER_TITLE);
SET_LOCALIZED_STRING(ABOUT_MEMORY_LINK); source->AddLocalizedString("aboutMemoryLink",
SET_LOCALIZED_STRING(KILL_CHROMEOS); IDS_TASK_MANAGER_ABOUT_MEMORY_LINK);
SET_LOCALIZED_STRING(PROCESS_ID_COLUMN); source->AddLocalizedString("killChromeOS", IDS_TASK_MANAGER_KILL_CHROMEOS);
SET_LOCALIZED_STRING(PAGE_COLUMN); source->AddLocalizedString("processIDColumn",
SET_LOCALIZED_STRING(PROFILE_NAME_COLUMN); IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
SET_LOCALIZED_STRING(NET_COLUMN); source->AddLocalizedString("pageColumn", IDS_TASK_MANAGER_PAGE_COLUMN);
SET_LOCALIZED_STRING(CPU_COLUMN); source->AddLocalizedString("profileNameColumn",
SET_LOCALIZED_STRING(PHYSICAL_MEM_COLUMN); IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
SET_LOCALIZED_STRING(SHARED_MEM_COLUMN); source->AddLocalizedString("netColumn", IDS_TASK_MANAGER_NET_COLUMN);
SET_LOCALIZED_STRING(PRIVATE_MEM_COLUMN); source->AddLocalizedString("cpuColumn", IDS_TASK_MANAGER_CPU_COLUMN);
SET_LOCALIZED_STRING(GOATS_TELEPORTED_COLUMN); source->AddLocalizedString("physicalMemColumn",
SET_LOCALIZED_STRING(WEBCORE_IMAGE_CACHE_COLUMN); IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN);
SET_LOCALIZED_STRING(WEBCORE_SCRIPTS_CACHE_COLUMN); source->AddLocalizedString("sharedMemColumn",
SET_LOCALIZED_STRING(WEBCORE_CSS_CACHE_COLUMN); IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
SET_LOCALIZED_STRING(FPS_COLUMN); source->AddLocalizedString("privateMemColumn",
SET_LOCALIZED_STRING(SQLITE_MEMORY_USED_COLUMN); IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
SET_LOCALIZED_STRING(JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); source->AddLocalizedString("goatsTeleportedColumn",
SET_LOCALIZED_STRING(INSPECT); IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
SET_LOCALIZED_STRING(ACTIVATE); source->AddLocalizedString("webcoreImageCacheColumn",
IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN);
source->AddLocalizedString("webcoreScriptsCacheColumn",
IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
source->AddLocalizedString("webcoreCSSCacheColumn",
IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN);
source->AddLocalizedString("sqliteMemoryUsedColumn",
IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
source->AddLocalizedString(
"javascriptMemoryAllocatedColumn",
IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT);
source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE);
source->set_json_path("strings.js"); source->set_json_path("strings.js");
source->add_resource_path("main.js", IDR_TASK_MANAGER_JS); source->add_resource_path("main.js", IDR_TASK_MANAGER_JS);
source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS); source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment