Revise about: and chrome: url handling.

chrome/browser/ui/webui/chrome_web_ui_factory.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 82 matching lines @@
   if (url.host() == chrome::kChromeUIDialogHost)
     return &NewWebUI<ConstrainedHtmlUI>;
 
   ExtensionService* service = profile ? profile->GetExtensionService() : NULL;
   if (service && service->ExtensionBindingsAllowed(url))
     return &NewWebUI<ExtensionWebUI>;
 
   // All platform builds of Chrome will need to have a cloud printing
   // dialog as backup.  It's just that on Chrome OS, it's the only
   // print dialog.
-  if (url.host() == chrome::kCloudPrintResourcesHost)
+  if (url.host() == chrome::kChromeUICloudPrintResourcesHost)
     return &NewWebUI<ExternalHtmlDialogUI>;
 
   // This will get called a lot to check all URLs, so do a quick check of other
   // schemes to filter out most URLs.
   if (!url.SchemeIs(chrome::kChromeDevToolsScheme) &&
       !url.SchemeIs(chrome::kChromeInternalScheme) &&
       !url.SchemeIs(chrome::kChromeUIScheme))
     return NULL;
 
   if (url.host() == chrome::kChromeUISyncResourcesHost ||
-      url.host() == chrome::kCloudPrintSetupHost)
+      url.host() == chrome::kChromeUICloudPrintSetupHost)
     return &NewWebUI<HtmlDialogUI>;
 
   // Special case the new tab page. In older versions of Chrome, the new tab
   // page was hosted at chrome-internal:<blah>. This might be in people's saved
   // sessions or bookmarks, so we say any URL with that scheme triggers the new
   // tab page.
   if (url.host() == chrome::kChromeUINewTabHost ||
       url.SchemeIs(chrome::kChromeInternalScheme))
     return &NewWebUI<NewTabUI>;
 
-  // Give about:about a generic Web UI so it can navigate to pages with Web UIs.
-  if (url.spec() == chrome::kChromeUIAboutAboutURL)
+  // Return a generic Web UI so chrome:chrome-urls can navigate to Web UI pages.
+  if (url.host() == chrome::kChromeUIAboutHost ||
+      url.host() == chrome::kChromeUIChromeURLsHost)
     return &NewWebUI<ChromeWebUI>;
 
   // We must compare hosts only since some of the Web UIs append extra stuff
   // after the host name.
   if (url.host() == chrome::kChromeUIBookmarksHost)
     return &NewWebUI<BookmarksUI>;
   if (url.host() == chrome::kChromeUIBugReportHost)
     return &NewWebUI<BugReportUI>;
   if (url.host() == chrome::kChromeUICrashesHost)
     return &NewWebUI<CrashesUI>;
@@ skipping 110 matching lines @@
 
 bool ChromeWebUIFactory::IsURLAcceptableForWebUI(
     Profile* profile,
     const GURL& url) const {
   return UseWebUIForURL(profile, url) ||
       // javacsript: URLs are allowed to run in Web UI pages
       url.SchemeIs(chrome::kJavaScriptScheme) ||
       // It's possible to load about:blank in a Web UI renderer.
       // See http://crbug.com/42547
       url.spec() == chrome::kAboutBlankURL ||
-      // about:crash, about:kill, about:hang, and about:shorthang are allowed.
-      url.spec() == chrome::kAboutCrashURL ||
-      url.spec() == chrome::kAboutKillURL ||
-      url.spec() == chrome::kAboutHangURL ||
-      url.spec() == chrome::kAboutShorthangURL;
+      // Chrome URLs crash, kill, hang, and shorthang are allowed.
+      url == GURL(chrome::kChromeUICrashURL) ||
+      url == GURL(chrome::kChromeUIKillURL) ||
+      url == GURL(chrome::kChromeUIHangURL) ||
+      url == GURL(chrome::kChromeUIShorthangURL);
 }
 
 WebUI* ChromeWebUIFactory::CreateWebUIForURL(
     TabContents* tab_contents,
     const GURL& url) const {
   WebUIFactoryFunction function = GetWebUIFactoryFunction(
       tab_contents->profile(), url);
   if (!function)
     return NULL;
   return (*function)(tab_contents, url);
@@ skipping 26 matching lines @@
       ChromeWebUIFactory, TestChromeWebUIFactory> >::get();
 }
 
 ChromeWebUIFactory::ChromeWebUIFactory() {
 }
 
 ChromeWebUIFactory::~ChromeWebUIFactory() {
 }
 
 RefCountedMemory* ChromeWebUIFactory::GetFaviconResourceBytes(
-    const GURL& page_url) const  {
+    const GURL& page_url) const {
   // The bookmark manager is a chrome extension, so we have to check for it
   // before we check for extension scheme.
   if (page_url.host() == extension_misc::kBookmarkManagerId)
     return BookmarksUI::GetFaviconResourceBytes();
 
   // The extension scheme is handled in GetFaviconForURL.
   if (page_url.SchemeIs(chrome::kExtensionScheme)) {
     NOTREACHED();
     return NULL;
   }
@@ skipping 28 matching lines @@
     return FlashUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
   return NULL;
 }