diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 18:34:03 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 18:34:03 +0000 |
commit | 89f550b854228a6414d017c9186e3e8540b69e13 (patch) | |
tree | 863139cb1cfeeeeeebbfb48b729373ce4c12f112 /chrome/common/about_handler.cc | |
parent | 56283961a67c5beb667589a547adf3d94db018e9 (diff) | |
download | chromium_src-89f550b854228a6414d017c9186e3e8540b69e13.zip chromium_src-89f550b854228a6414d017c9186e3e8540b69e13.tar.gz chromium_src-89f550b854228a6414d017c9186e3e8540b69e13.tar.bz2 |
*Fixup about and chrome scheme URLs in URLFixerUpper::FixupURL.
*Update AboutSource to use the source_name of each about/chrome page.
*Make WillHandleBrowserAboutURL fix up schemes and handle chrome://foo/
-Redirect memory to memory-redirect (wasn't handling chrome://memory/).
-Catalog all kChromeUI*Hosts in url_constants.cc
-Simplify paths (credits, os-credits, ipc, settings, about/version).
-Nix web_ui_util::ChromeURLHostEquals (use scheme & host comparison).
-Favor GURL::SchemeIs and url_constants, update & expand tests.
-Add and fixup chrome://chrome-urls (the about:about page).
-Update special_tabs.py from Nirnimesh's codereview.chromium.org/6995057/.
This change was reverted with r88166 for sync_integration_tests failures.
These failures are a tangential issue, crbug.com/85294; I'll re-land this soon.
BUG=55771
TEST=Access about:, about://, chrome:, chrome:// pages.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=88142
Review URL: http://codereview.chromium.org/7068007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/about_handler.cc')
-rw-r--r-- | chrome/common/about_handler.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/common/about_handler.cc b/chrome/common/about_handler.cc index 6e3e152..fded391 100644 --- a/chrome/common/about_handler.cc +++ b/chrome/common/about_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,18 +11,16 @@ namespace chrome_about_handler { // This needs to match up with about_urls_handlers in // chrome/renderer/about_handler.cc. const char* const about_urls[] = { - chrome::kAboutCrashURL, - chrome::kAboutKillURL, - chrome::kAboutHangURL, - chrome::kAboutShorthangURL, + chrome::kChromeUICrashURL, + chrome::kChromeUIKillURL, + chrome::kChromeUIHangURL, + chrome::kChromeUIShorthangURL, NULL, }; const size_t about_urls_size = arraysize(about_urls); -const char* const kAboutScheme = "about"; - bool WillHandle(const GURL& url) { - if (url.scheme() != kAboutScheme) + if (!url.SchemeIs(chrome::kChromeUIScheme)) return false; const char* const* url_handler = about_urls; |