summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 18:34:03 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 18:34:03 +0000
commit89f550b854228a6414d017c9186e3e8540b69e13 (patch)
tree863139cb1cfeeeeeebbfb48b729373ce4c12f112 /chrome/browser/history
parent56283961a67c5beb667589a547adf3d94db018e9 (diff)
downloadchromium_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/browser/history')
-rw-r--r--chrome/browser/history/history.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index cbed0a6..45e8364 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -704,13 +704,10 @@ bool HistoryService::CanAddURL(const GURL& url) {
url.SchemeIs(chrome::kChromeInternalScheme))
return false;
- if (url.SchemeIs(chrome::kAboutScheme)) {
- if (LowerCaseEqualsASCII(url.path(), "blank"))
- return false;
- // We allow all other about URLs since the user may like to see things
- // like "about:memory" or "about:histograms" in their history and
- // autocomplete.
- }
+ // Allow all about: and chrome: URLs except about:blank, since the user may
+ // like to see "chrome://memory/", etc. in their history and autocomplete.
+ if (url == GURL(chrome::kAboutBlankURL))
+ return false;
return true;
}