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

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

Issue 8993007: WebUI TaskManager: Delay scripts loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: marge with master Created 8 years, 11 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/ui/webui/chrome_url_data_manager_backend.cc ('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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN); 56 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
57 source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN); 57 source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN);
58 source->AddLocalizedString("sqliteMemoryUsedColumn", 58 source->AddLocalizedString("sqliteMemoryUsedColumn",
59 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN); 59 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
60 source->AddLocalizedString( 60 source->AddLocalizedString(
61 "javascriptMemoryAllocatedColumn", 61 "javascriptMemoryAllocatedColumn",
62 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); 62 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
63 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT); 63 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT);
64 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE); 64 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE);
65 source->set_json_path("strings.js"); 65 source->set_json_path("strings.js");
66 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS);
67 source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS);
68 source->set_default_resource(IDR_TASK_MANAGER_HTML); 66 source->set_default_resource(IDR_TASK_MANAGER_HTML);
69 67
70 return source; 68 return source;
71 } 69 }
72 70
73 } // namespace 71 } // namespace
74 72
75 /////////////////////////////////////////////////////////////////////////////// 73 ///////////////////////////////////////////////////////////////////////////////
76 // 74 //
77 // TaskManagerUI 75 // TaskManagerUI
78 // 76 //
79 /////////////////////////////////////////////////////////////////////////////// 77 ///////////////////////////////////////////////////////////////////////////////
80 78
81 TaskManagerUI::TaskManagerUI(content::WebUI* web_ui) : WebUIController(web_ui) { 79 TaskManagerUI::TaskManagerUI(content::WebUI* web_ui) : WebUIController(web_ui) {
82 web_ui->AddMessageHandler(new TaskManagerHandler(TaskManager::GetInstance())); 80 web_ui->AddMessageHandler(new TaskManagerHandler(TaskManager::GetInstance()));
83 81
84 // Set up the chrome://taskmanager/ source. 82 // Set up the chrome://taskmanager/ source.
85 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 83 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
86 Profile* profile = Profile::FromWebUI(web_ui); 84 Profile* profile = Profile::FromWebUI(web_ui);
87 profile->GetChromeURLDataManager()->AddDataSource(html_source); 85 profile->GetChromeURLDataManager()->AddDataSource(html_source);
88 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698