diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 04:21:16 +0000 |
| commit | 60e4489819cec6689927c88a4d6114c388fe89fb (patch) | |
| tree | 68c0f7f657bee7020e3bb2922b64b86f93070e61 /chrome/browser/debugger | |
| parent | f76b3b04a4c092d7db4cc2a75da4ca7fbac1f620 (diff) | |
| download | chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.zip chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.gz chromium_src-60e4489819cec6689927c88a4d6114c388fe89fb.tar.bz2 | |
Change chrome-ui to chrome. I didn't go too far in converting existing strings to using the url_constant (shipshipship).
Users (such as those on Beta and Dev using session restore) attempting to load the old pages will see a blank white screen.
BUG=11272
TEST=Verify that the inspector, debugger, history, downloads and newtab pages load with chrome:// URLS. Verify that replacing the chrome:// with chrome-ui:// does not work.
Review URL: http://codereview.chromium.org/101026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/debugger_view.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_view.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index cfd53a8..fb09551 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -21,6 +21,7 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" +#include "chrome/common/url_constants.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/controls/scroll_view.h" @@ -104,7 +105,8 @@ void DebuggerView::OnInit() { web_container_->SetTabContents(tab_contents_); tab_contents_->render_view_host()->AllowDOMUIBindings(); - GURL contents("chrome-ui://inspector/debugger.html"); + GURL contents(std::string(chrome::kChromeUIScheme) + + "//inspector/debugger.html"); tab_contents_->controller().LoadURL(contents, GURL(), PageTransition::START_PAGE); } diff --git a/chrome/browser/debugger/devtools_view.cc b/chrome/browser/debugger/devtools_view.cc index 34cbb20..7a9e59f 100644 --- a/chrome/browser/debugger/devtools_view.cc +++ b/chrome/browser/debugger/devtools_view.cc @@ -54,7 +54,7 @@ void DevToolsView::Init() { web_container_->SetTabContents(tab_contents_); tab_contents_->render_view_host()->AllowDOMUIBindings(); - // chrome-ui://devtools/devtools.html + // chrome://devtools/devtools.html GURL contents(std::string(chrome::kChromeUIDevToolsURL) + "devtools.html"); // this will call CreateRenderView to create renderer process |