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

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

Issue 7608028: WebUI TaskManager: omit an useless ampersand. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months 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.html ('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"
(...skipping 15 matching lines...) Expand all
26 #define SET_LOCALIZED_STRING(ID) \ 26 #define SET_LOCALIZED_STRING(ID) \
27 source->AddLocalizedString(#ID, IDS_TASK_MANAGER_##ID) 27 source->AddLocalizedString(#ID, IDS_TASK_MANAGER_##ID)
28 28
29 ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { 29 ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() {
30 ChromeWebUIDataSource* source = 30 ChromeWebUIDataSource* source =
31 new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost); 31 new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost);
32 32
33 source->AddLocalizedString("CLOSE_WINDOW", IDS_CLOSE); 33 source->AddLocalizedString("CLOSE_WINDOW", IDS_CLOSE);
34 SET_LOCALIZED_STRING(TITLE); 34 SET_LOCALIZED_STRING(TITLE);
35 SET_LOCALIZED_STRING(ABOUT_MEMORY_LINK); 35 SET_LOCALIZED_STRING(ABOUT_MEMORY_LINK);
36 SET_LOCALIZED_STRING(KILL); 36 SET_LOCALIZED_STRING(KILL_CHROMEOS);
37 SET_LOCALIZED_STRING(PROCESS_ID_COLUMN); 37 SET_LOCALIZED_STRING(PROCESS_ID_COLUMN);
38 SET_LOCALIZED_STRING(PAGE_COLUMN); 38 SET_LOCALIZED_STRING(PAGE_COLUMN);
39 SET_LOCALIZED_STRING(NET_COLUMN); 39 SET_LOCALIZED_STRING(NET_COLUMN);
40 SET_LOCALIZED_STRING(CPU_COLUMN); 40 SET_LOCALIZED_STRING(CPU_COLUMN);
41 SET_LOCALIZED_STRING(PHYSICAL_MEM_COLUMN); 41 SET_LOCALIZED_STRING(PHYSICAL_MEM_COLUMN);
42 SET_LOCALIZED_STRING(SHARED_MEM_COLUMN); 42 SET_LOCALIZED_STRING(SHARED_MEM_COLUMN);
43 SET_LOCALIZED_STRING(PRIVATE_MEM_COLUMN); 43 SET_LOCALIZED_STRING(PRIVATE_MEM_COLUMN);
44 SET_LOCALIZED_STRING(GOATS_TELEPORTED_COLUMN); 44 SET_LOCALIZED_STRING(GOATS_TELEPORTED_COLUMN);
45 SET_LOCALIZED_STRING(WEBCORE_IMAGE_CACHE_COLUMN); 45 SET_LOCALIZED_STRING(WEBCORE_IMAGE_CACHE_COLUMN);
46 SET_LOCALIZED_STRING(WEBCORE_SCRIPTS_CACHE_COLUMN); 46 SET_LOCALIZED_STRING(WEBCORE_SCRIPTS_CACHE_COLUMN);
(...skipping 24 matching lines...) Expand all
71 handler->Attach(this); 71 handler->Attach(this);
72 handler->Init(); 72 handler->Init();
73 AddMessageHandler(handler); 73 AddMessageHandler(handler);
74 74
75 // Set up the chrome://taskmanager/ source. 75 // Set up the chrome://taskmanager/ source.
76 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 76 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
77 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); 77 Profile* profile = Profile::FromBrowserContext(contents->browser_context());
78 profile->GetChromeURLDataManager()->AddDataSource(html_source); 78 profile->GetChromeURLDataManager()->AddDataSource(html_source);
79 } 79 }
80 80
OLDNEW
« no previous file with comments | « chrome/browser/resources/task_manager/main.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698