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

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

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/task_manager/main.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_ui.h" 5 #include "chrome/browser/ui/webui/task_manager_ui.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/task_manager/task_manager.h" 9 #include "chrome/browser/task_manager/task_manager.h"
10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
11 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 11 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
12 #include "chrome/browser/ui/webui/task_manager_handler.h" 12 #include "chrome/browser/ui/webui/task_manager_handler.h"
13 #include "chrome/common/url_constants.h" 13 #include "chrome/common/url_constants.h"
14 #include "content/browser/tab_contents/tab_contents.h" 14 #include "content/browser/tab_contents/tab_contents.h"
15 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/chromium_strings.h" 17 #include "grit/chromium_strings.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 21
22 namespace { 22 namespace {
23 23
24 // Convenience macro for AddLocalizedString() method.
25 #define SET_LOCALIZED_STRING(ID) \
26 source->AddLocalizedString(#ID, IDS_TASK_MANAGER_##ID)
27
28 ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { 24 ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() {
29 ChromeWebUIDataSource* source = 25 ChromeWebUIDataSource* source =
30 new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost); 26 new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost);
31 27
32 source->AddLocalizedString("CLOSE_WINDOW", IDS_CLOSE); 28 source->AddLocalizedString("closeWindow", IDS_CLOSE);
33 SET_LOCALIZED_STRING(TITLE); 29 source->AddLocalizedString("title",IDS_TASK_MANAGER_TITLE);
34 SET_LOCALIZED_STRING(ABOUT_MEMORY_LINK); 30 source->AddLocalizedString("aboutMemoryLink",
35 SET_LOCALIZED_STRING(KILL_CHROMEOS); 31 IDS_TASK_MANAGER_ABOUT_MEMORY_LINK);
36 SET_LOCALIZED_STRING(PROCESS_ID_COLUMN); 32 source->AddLocalizedString("killChromeOS", IDS_TASK_MANAGER_KILL_CHROMEOS);
37 SET_LOCALIZED_STRING(PAGE_COLUMN); 33 source->AddLocalizedString("processIDColumn",
38 SET_LOCALIZED_STRING(PROFILE_NAME_COLUMN); 34 IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
39 SET_LOCALIZED_STRING(NET_COLUMN); 35 source->AddLocalizedString("pageColumn", IDS_TASK_MANAGER_PAGE_COLUMN);
40 SET_LOCALIZED_STRING(CPU_COLUMN); 36 source->AddLocalizedString("profileNameColumn",
41 SET_LOCALIZED_STRING(PHYSICAL_MEM_COLUMN); 37 IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
42 SET_LOCALIZED_STRING(SHARED_MEM_COLUMN); 38 source->AddLocalizedString("netColumn", IDS_TASK_MANAGER_NET_COLUMN);
43 SET_LOCALIZED_STRING(PRIVATE_MEM_COLUMN); 39 source->AddLocalizedString("cpuColumn", IDS_TASK_MANAGER_CPU_COLUMN);
44 SET_LOCALIZED_STRING(GOATS_TELEPORTED_COLUMN); 40 source->AddLocalizedString("physicalMemColumn",
45 SET_LOCALIZED_STRING(WEBCORE_IMAGE_CACHE_COLUMN); 41 IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN);
46 SET_LOCALIZED_STRING(WEBCORE_SCRIPTS_CACHE_COLUMN); 42 source->AddLocalizedString("sharedMemColumn",
47 SET_LOCALIZED_STRING(WEBCORE_CSS_CACHE_COLUMN); 43 IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
48 SET_LOCALIZED_STRING(FPS_COLUMN); 44 source->AddLocalizedString("privateMemColumn",
49 SET_LOCALIZED_STRING(SQLITE_MEMORY_USED_COLUMN); 45 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
50 SET_LOCALIZED_STRING(JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); 46 source->AddLocalizedString("goatsTeleportedColumn",
51 SET_LOCALIZED_STRING(INSPECT); 47 IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
52 SET_LOCALIZED_STRING(ACTIVATE); 48 source->AddLocalizedString("webcoreImageCacheColumn",
49 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN);
50 source->AddLocalizedString("webcoreScriptsCacheColumn",
51 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
52 source->AddLocalizedString("webcoreCSSCacheColumn",
53 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
54 source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN);
55 source->AddLocalizedString("sqliteMemoryUsedColumn",
56 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
57 source->AddLocalizedString(
58 "javascriptMemoryAllocatedColumn",
59 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
60 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT);
61 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE);
53 source->set_json_path("strings.js"); 62 source->set_json_path("strings.js");
54 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS); 63 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS);
55 source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS); 64 source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS);
56 source->set_default_resource(IDR_TASK_MANAGER_HTML); 65 source->set_default_resource(IDR_TASK_MANAGER_HTML);
57 66
58 return source; 67 return source;
59 } 68 }
60 69
61 } // namespace 70 } // namespace
62 71
63 /////////////////////////////////////////////////////////////////////////////// 72 ///////////////////////////////////////////////////////////////////////////////
64 // 73 //
65 // TaskManagerUI 74 // TaskManagerUI
66 // 75 //
67 /////////////////////////////////////////////////////////////////////////////// 76 ///////////////////////////////////////////////////////////////////////////////
68 77
69 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) { 78 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) {
70 TaskManagerHandler* handler = 79 TaskManagerHandler* handler =
71 new TaskManagerHandler(TaskManager::GetInstance()); 80 new TaskManagerHandler(TaskManager::GetInstance());
72 81
73 handler->Attach(this); 82 handler->Attach(this);
74 handler->Init(); 83 handler->Init();
75 AddMessageHandler(handler); 84 AddMessageHandler(handler);
76 85
77 // Set up the chrome://taskmanager/ source. 86 // Set up the chrome://taskmanager/ source.
78 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 87 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
79 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); 88 Profile* profile = Profile::FromBrowserContext(contents->browser_context());
80 profile->GetChromeURLDataManager()->AddDataSource(html_source); 89 profile->GetChromeURLDataManager()->AddDataSource(html_source);
81 } 90 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/task_manager/main.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698