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

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

Issue 8873054: Revert 113772 - WebUI TaskManager: Optimize initialization taskmanager and loading scripts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN); 53 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
54 source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN); 54 source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN);
55 source->AddLocalizedString("sqliteMemoryUsedColumn", 55 source->AddLocalizedString("sqliteMemoryUsedColumn",
56 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN); 56 IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
57 source->AddLocalizedString( 57 source->AddLocalizedString(
58 "javascriptMemoryAllocatedColumn", 58 "javascriptMemoryAllocatedColumn",
59 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); 59 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
60 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT); 60 source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT);
61 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE); 61 source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE);
62 source->set_json_path("strings.js"); 62 source->set_json_path("strings.js");
63 source->add_resource_path("main.js", IDR_TASK_MANAGER_JS);
64 source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS);
63 source->set_default_resource(IDR_TASK_MANAGER_HTML); 65 source->set_default_resource(IDR_TASK_MANAGER_HTML);
64 66
65 return source; 67 return source;
66 } 68 }
67 69
68 } // namespace 70 } // namespace
69 71
70 /////////////////////////////////////////////////////////////////////////////// 72 ///////////////////////////////////////////////////////////////////////////////
71 // 73 //
72 // TaskManagerUI 74 // TaskManagerUI
73 // 75 //
74 /////////////////////////////////////////////////////////////////////////////// 76 ///////////////////////////////////////////////////////////////////////////////
75 77
76 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) { 78 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) {
77 TaskManagerHandler* handler = 79 TaskManagerHandler* handler =
78 new TaskManagerHandler(TaskManager::GetInstance()); 80 new TaskManagerHandler(TaskManager::GetInstance());
79 81
80 handler->Attach(this); 82 handler->Attach(this);
81 handler->Init(); 83 handler->Init();
82 AddMessageHandler(handler); 84 AddMessageHandler(handler);
83 85
84 // Set up the chrome://taskmanager/ source. 86 // Set up the chrome://taskmanager/ source.
85 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 87 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
86 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); 88 Profile* profile = Profile::FromBrowserContext(contents->browser_context());
87 profile->GetChromeURLDataManager()->AddDataSource(html_source); 89 profile->GetChromeURLDataManager()->AddDataSource(html_source);
88 } 90 }
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