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/browser_about_handler.cc | |
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/browser_about_handler.cc')
-rw-r--r-- | chrome/browser/browser_about_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 662671e..96fa213 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -76,7 +76,7 @@ ChromeURLDataManager::DataSource* about_source = NULL; // time that about memory is being computed. std::string GetAboutMemoryRedirectResponse() { return "<meta http-equiv=\"refresh\" " - "content=\"0;chrome-ui://about/memory\">"; + "content=\"0;chrome://about/memory\">"; } class AboutSource : public ChromeURLDataManager::DataSource { @@ -612,20 +612,20 @@ bool WillHandleBrowserAboutURL(GURL* url) { // Special case about:memory to go through a redirect before ending up on // the final page. See GetAboutMemoryRedirectResponse above for why. if (LowerCaseEqualsASCII(url->path(), kMemoryPath)) { - *url = GURL("chrome-ui://about/memory-redirect"); + *url = GURL("chrome://about/memory-redirect"); return true; } - // Rewrite the about URL to use chrome-ui. WebKit treats all about URLS the + // Rewrite the about URL to use chrome:. WebKit treats all about URLS the // same (blank page), so if we want to display content, we need another // scheme. - std::string about_url = "chrome-ui://about/"; + std::string about_url = "chrome://about/"; about_url.append(url->path()); *url = GURL(about_url); return true; } -// This function gets called with the fixed-up chrome-ui URLs, so we have to +// This function gets called with the fixed-up chrome: URLs, so we have to // compare against those instead of "about:blah". bool HandleNonNavigationAboutURL(const GURL& url) { // About:network and IPC and currently buggy, so we disable it for official |