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

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

Issue 102073008: Allow multiple NaCl modules to be debugged. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 7 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/task_manager_ui.h" 5 #include "chrome/browser/ui/webui/task_manager/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/task_manager/task_manager_handler.h" 10 #include "chrome/browser/ui/webui/task_manager/task_manager_handler.h"
(...skipping 20 matching lines...) Expand all
31 source->AddLocalizedString("closeWindow", IDS_CLOSE); 31 source->AddLocalizedString("closeWindow", IDS_CLOSE);
32 source->AddLocalizedString("title", IDS_TASK_MANAGER_TITLE); 32 source->AddLocalizedString("title", IDS_TASK_MANAGER_TITLE);
33 source->AddLocalizedString("aboutMemoryLink", 33 source->AddLocalizedString("aboutMemoryLink",
34 IDS_TASK_MANAGER_ABOUT_MEMORY_LINK); 34 IDS_TASK_MANAGER_ABOUT_MEMORY_LINK);
35 source->AddLocalizedString("killButton", IDS_TASK_MANAGER_KILL); 35 source->AddLocalizedString("killButton", IDS_TASK_MANAGER_KILL);
36 source->AddLocalizedString("processIDColumn", 36 source->AddLocalizedString("processIDColumn",
37 IDS_TASK_MANAGER_PROCESS_ID_COLUMN); 37 IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
38 source->AddLocalizedString("taskColumn", IDS_TASK_MANAGER_TASK_COLUMN); 38 source->AddLocalizedString("taskColumn", IDS_TASK_MANAGER_TASK_COLUMN);
39 source->AddLocalizedString("profileNameColumn", 39 source->AddLocalizedString("profileNameColumn",
40 IDS_TASK_MANAGER_PROFILE_NAME_COLUMN); 40 IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
41 source->AddLocalizedString("naclDebugStubPort",
42 IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT);
41 source->AddLocalizedString("netColumn", IDS_TASK_MANAGER_NET_COLUMN); 43 source->AddLocalizedString("netColumn", IDS_TASK_MANAGER_NET_COLUMN);
42 source->AddLocalizedString("cpuColumn", IDS_TASK_MANAGER_CPU_COLUMN); 44 source->AddLocalizedString("cpuColumn", IDS_TASK_MANAGER_CPU_COLUMN);
43 source->AddLocalizedString("physicalMemColumn", 45 source->AddLocalizedString("physicalMemColumn",
44 IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN); 46 IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN);
45 source->AddLocalizedString("sharedMemColumn", 47 source->AddLocalizedString("sharedMemColumn",
46 IDS_TASK_MANAGER_SHARED_MEM_COLUMN); 48 IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
47 source->AddLocalizedString("privateMemColumn", 49 source->AddLocalizedString("privateMemColumn",
48 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN); 50 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
49 source->AddLocalizedString("goatsTeleportedColumn", 51 source->AddLocalizedString("goatsTeleportedColumn",
50 IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN); 52 IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 /////////////////////////////////////////////////////////////////////////////// 89 ///////////////////////////////////////////////////////////////////////////////
88 90
89 TaskManagerUI::TaskManagerUI(content::WebUI* web_ui) : WebUIController(web_ui) { 91 TaskManagerUI::TaskManagerUI(content::WebUI* web_ui) : WebUIController(web_ui) {
90 web_ui->AddMessageHandler(new TaskManagerHandler(TaskManager::GetInstance())); 92 web_ui->AddMessageHandler(new TaskManagerHandler(TaskManager::GetInstance()));
91 93
92 // Set up the chrome://taskmanager/ source. 94 // Set up the chrome://taskmanager/ source.
93 content::WebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 95 content::WebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
94 Profile* profile = Profile::FromWebUI(web_ui); 96 Profile* profile = Profile::FromWebUI(web_ui);
95 content::WebUIDataSource::Add(profile, html_source); 97 content::WebUIDataSource::Add(profile, html_source);
96 } 98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698