4 files changed, 20 insertions, 3 deletions
diff --git a/chrome/browser/debugger/dev_tools_view.cc b/chrome/browser/debugger/dev_tools_view.cc
index 4eab83b..4b2f51d 100644
--- a/chrome/browser/debugger/dev_tools_view.cc
+++ b/chrome/browser/debugger/dev_tools_view.cc
@@ -4,12 +4,15 @@
 
 #include "chrome/browser/debugger/dev_tools_view.h"
 
+#include <string>
+
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/common/property_bag.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 
 DevToolsView::DevToolsView(int inspected_process_id, int inspected_view_id)
     : inspected_process_id_(inspected_process_id),
@@ -68,7 +71,10 @@ void DevToolsView::Init() {
   web_contents_->render_view_host()->SetInspectedView(inspected_process_id_,
                                                       inspected_view_id_);
 
-  GURL contents("chrome-ui://inspector/debugger-oop.html");
+  // chrome-ui://devtools/tools.html
+  GURL contents(std::string(chrome::kChromeUIScheme) + "://" +
+                chrome::kDevToolsHost + "/tools.html");
+
   // this will call CreateRenderView to create renderer process
   web_contents_->controller()->LoadURL(contents, GURL(),
                                        PageTransition::START_PAGE);
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 532c117..d0e4193 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/ref_counted_util.h"
+#include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_job.h"
@@ -97,8 +98,14 @@ void RegisterURLRequestChromeJob() {
   }
 
   std::wstring inspector_dir;
-  if (PathService::Get(chrome::DIR_INSPECTOR, &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-ui://inspector
+    // for the Console Debugger and in-process Web Inspector.
     chrome_url_data_manager.AddFileSource("inspector", inspector_dir);
+    chrome_url_data_manager.AddFileSource(chrome::kDevToolsHost, inspector_dir);
+  }
 
   URLRequest::RegisterProtocolFactory(kChromeURLScheme,
                                       &ChromeURLDataManager::Factory);
@@ -111,8 +118,10 @@ void RegisterURLRequestChromeJob() {
 
 void UnregisterURLRequestChromeJob() {
   std::wstring inspector_dir;
-  if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir))
+  if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
     chrome_url_data_manager.RemoveFileSource("inspector");
+    chrome_url_data_manager.RemoveFileSource(chrome::kDevToolsHost);
+  }
 }
 
 // static
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 62193b21..9f718ca 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -32,5 +32,6 @@ const char kChromeUINetworkURL[] = "chrome-ui://about/network";
 const char kChromeUINewTabURL[] = "chrome-ui://newtab";
 
 const char kNewTabHost[] = "newtab";
+const char kDevToolsHost[] = "devtools";
 
 }  // namespace chrome
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 63989e9..6abc73d 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -40,6 +40,7 @@ extern const char kChromeUINewTabURL[];
 
 // chrome-ui components of URLs.
 extern const char kNewTabHost[];
+extern const char kDevToolsHost[];
 
 }  // namespace chrome