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

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

Issue 10854076: Add GPU memory tab to the task manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 8 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
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/chrome_url_data_manager.h" 10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 source->AddLocalizedString("privateMemColumn", 48 source->AddLocalizedString("privateMemColumn",
49 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN); 49 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
50 source->AddLocalizedString("goatsTeleportedColumn", 50 source->AddLocalizedString("goatsTeleportedColumn",
51 IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN); 51 IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
52 source->AddLocalizedString("webcoreImageCacheColumn", 52 source->AddLocalizedString("webcoreImageCacheColumn",
53 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN); 53 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN);
54 source->AddLocalizedString("webcoreScriptsCacheColumn", 54 source->AddLocalizedString("webcoreScriptsCacheColumn",
55 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN); 55 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
56 source->AddLocalizedString("webcoreCSSCacheColumn", 56 source->AddLocalizedString("webcoreCSSCacheColumn",
57 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN); 57 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
58 source->AddLocalizedString("videoMemoryColumn",
59 IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN);
58 source->AddLocalizedString("fpsColumn", IDS_TASK_MANAGER_FPS_COLUMN); 60 source->AddLocalizedString("fpsColumn", IDS_TASK_MANAGER_FPS_COLUMN);
59 source->AddLocalizedString("sqliteMemoryUsedColumn", 61 source->AddLocalizedString("sqliteMemoryUsedColumn",
60 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN); 62 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
61 source->AddLocalizedString( 63 source->AddLocalizedString(
62 "javascriptMemoryAllocatedColumn", 64 "javascriptMemoryAllocatedColumn",
63 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); 65 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
64 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT); 66 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT);
65 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE); 67 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE);
66 source->set_json_path("strings.js"); 68 source->set_json_path("strings.js");
67 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS); 69 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS);
(...skipping 19 matching lines...) Expand all
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 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 95 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
94 Profile* profile = Profile::FromWebUI(web_ui); 96 Profile* profile = Profile::FromWebUI(web_ui);
95 ChromeURLDataManager::AddDataSource(profile, html_source); 97 ChromeURLDataManager::AddDataSource(profile, html_source);
96 } 98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698