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_ui.cc

Issue 8993007: WebUI TaskManager: Delay scripts loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 8 years, 12 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) 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);
65 source->set_default_resource(IDR_TASK_MANAGER_HTML); 63 source->set_default_resource(IDR_TASK_MANAGER_HTML);
66 64
67 return source; 65 return source;
68 } 66 }
69 67
70 } // namespace 68 } // namespace
71 69
72 /////////////////////////////////////////////////////////////////////////////// 70 ///////////////////////////////////////////////////////////////////////////////
73 // 71 //
74 // TaskManagerUI 72 // TaskManagerUI
75 // 73 //
76 /////////////////////////////////////////////////////////////////////////////// 74 ///////////////////////////////////////////////////////////////////////////////
77 75
78 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) { 76 TaskManagerUI::TaskManagerUI(TabContents* contents) : ChromeWebUI(contents) {
79 TaskManagerHandler* handler = 77 TaskManagerHandler* handler =
80 new TaskManagerHandler(TaskManager::GetInstance()); 78 new TaskManagerHandler(TaskManager::GetInstance());
81 79
82 handler->Attach(this); 80 handler->Attach(this);
83 handler->Init(); 81 handler->Init();
84 AddMessageHandler(handler); 82 AddMessageHandler(handler);
85 83
86 // Set up the chrome://taskmanager/ source. 84 // Set up the chrome://taskmanager/ source.
87 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource(); 85 ChromeWebUIDataSource* html_source = CreateTaskManagerUIHTMLSource();
88 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); 86 Profile* profile = Profile::FromBrowserContext(contents->browser_context());
89 profile->GetChromeURLDataManager()->AddDataSource(html_source); 87 profile->GetChromeURLDataManager()->AddDataSource(html_source);
90 } 88 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698