diff options
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/chrome_url_data_manager_backend.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/task_manager_ui.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index 5c3295a..7066eb1 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -63,6 +63,7 @@ class ChromeURLContentSecurityPolicyExceptionSet insert(chrome::kChromeUIDialogHost); insert(chrome::kChromeUIInputWindowDialogHost); insert(chrome::kChromeUINewTabHost); + insert(chrome::kChromeUITaskManagerHost); #if defined(OS_CHROMEOS) insert(chrome::kChromeUIMobileSetupHost); insert(chrome::kChromeUIOobeHost); diff --git a/chrome/browser/ui/webui/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager_ui.cc index 0359b69..fe94bb6 100644 --- a/chrome/browser/ui/webui/task_manager_ui.cc +++ b/chrome/browser/ui/webui/task_manager_ui.cc @@ -60,8 +60,6 @@ ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { source->AddLocalizedString("inspect", IDS_TASK_MANAGER_INSPECT); source->AddLocalizedString("activate", IDS_TASK_MANAGER_ACTIVATE); source->set_json_path("strings.js"); - source->add_resource_path("main.js", IDR_TASK_MANAGER_JS); - source->add_resource_path("includes.js", IDR_TASK_MANAGER_INCLUDES_JS); source->set_default_resource(IDR_TASK_MANAGER_HTML); return source; |