summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 10:09:48 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 10:09:48 +0000
commit24242a8f1aef98df4d6afcbfea2366c24df8431e (patch)
treefc4b57549f235faca97d1e83db9e9713b91c5dc4
parent4bb6974fef5d689832bc7c3311c53afff950e4ce (diff)
downloadchromium_src-24242a8f1aef98df4d6afcbfea2366c24df8431e.zip
chromium_src-24242a8f1aef98df4d6afcbfea2366c24df8431e.tar.gz
chromium_src-24242a8f1aef98df4d6afcbfea2366c24df8431e.tar.bz2
DevTools: remove obsolete references to chrome://inspector/
Review URL: http://codereview.chromium.org/558040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37505 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/child_process_security_policy_unittest.cc2
-rw-r--r--chrome/browser/dom_ui/chrome_url_data_manager.cc7
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/child_process_security_policy_unittest.cc b/chrome/browser/child_process_security_policy_unittest.cc
index ae8645b..0f75f72 100644
--- a/chrome/browser/child_process_security_policy_unittest.cc
+++ b/chrome/browser/child_process_security_policy_unittest.cc
@@ -218,7 +218,7 @@ TEST_F(ChildProcessSecurityPolicyTest, CanUploadFiles) {
TEST_F(ChildProcessSecurityPolicyTest, CanServiceInspectElement) {
ChildProcessSecurityPolicy* p = ChildProcessSecurityPolicy::GetInstance();
- GURL url("chrome://inspector/inspector.html");
+ GURL url("chrome://devtools/devtools.html");
p->Add(kRendererID);
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 33e94cb..40e3a21 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -104,12 +104,6 @@ void RegisterURLRequestChromeJob() {
FilePath inspector_dir;
if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
- // TODO(yurys): remove "inspector" source when new developer tools support
- // all features of in-process Web Inspector and Console Debugger. For the
- // time being we need to serve the same content from chrome://inspector
- // for the Console Debugger and in-process Web Inspector.
- Singleton<ChromeURLDataManager>()->AddFileSource("inspector",
- inspector_dir);
Singleton<ChromeURLDataManager>()->AddFileSource(
chrome::kChromeUIDevToolsHost, inspector_dir);
}
@@ -123,7 +117,6 @@ void RegisterURLRequestChromeJob() {
void UnregisterURLRequestChromeJob() {
FilePath inspector_dir;
if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
- Singleton<ChromeURLDataManager>()->RemoveFileSource("inspector");
Singleton<ChromeURLDataManager>()->RemoveFileSource(
chrome::kChromeUIDevToolsHost);
}