From 89f550b854228a6414d017c9186e3e8540b69e13 Mon Sep 17 00:00:00 2001 From: "msw@chromium.org" Date: Wed, 8 Jun 2011 18:34:03 +0000 Subject: *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 --- chrome/browser/ui/gtk/browser_toolbar_gtk.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chrome/browser/ui/gtk/browser_toolbar_gtk.cc') diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index a401f54..06238dd 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -35,7 +35,6 @@ #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" -#include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -607,8 +606,8 @@ void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget, if (!url.is_valid()) return; - bool url_is_newtab = - web_ui_util::ChromeURLHostEquals(url, chrome::kChromeUINewTabHost); + bool url_is_newtab = url.SchemeIs(chrome::kChromeUIScheme) && + url.host() == chrome::kChromeUINewTabHost; home_page_is_new_tab_page_.SetValue(url_is_newtab); if (!url_is_newtab) home_page_.SetValue(url.spec()); -- cgit v1.1