diff options
| author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 14:44:35 +0000 |
|---|---|---|
| committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 14:44:35 +0000 |
| commit | cc4875592f172e4b9eba3ab4df1e10832592cd10 (patch) | |
| tree | d43c25c30ede1d121b77744d0801fc531dfaad47 /chrome/browser/debugger/dev_tools_view.cc | |
| parent | 44cbad8cfab5fd9356312b36b5d106d1f5fe1735 (diff) | |
| download | chromium_src-cc4875592f172e4b9eba3ab4df1e10832592cd10.zip chromium_src-cc4875592f172e4b9eba3ab4df1e10832592cd10.tar.gz chromium_src-cc4875592f172e4b9eba3ab4df1e10832592cd10.tar.bz2 | |
- Developer tools frontend is served from chrom-ui://devtools/tools.html
- Serve Web Inspector JS files from chrom-ui://devtools/ domain in addition to chrom-ui://inspector/. We cannot simply reuse "inspector" domain for now as we need different tab content types for console debugger and new developer tools front-end. When developer tools support all console debugger and web inspector features we will remove "inspector" domain from the source list.
Review URL: http://codereview.chromium.org/40222
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/dev_tools_view.cc')
| -rw-r--r-- | chrome/browser/debugger/dev_tools_view.cc | 8 |
1 files changed, 7 insertions, 1 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); |