Move remaining about: handlers to webUI.

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"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/webui/about_ui.h"
 #include "chrome/browser/ui/webui/bookmarks_ui.h"
 #include "chrome/browser/ui/webui/bug_report_ui.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/crashes_ui.h"
 #include "chrome/browser/ui/webui/devtools_ui.h"
 #include "chrome/browser/ui/webui/downloads_ui.h"
 #include "chrome/browser/ui/webui/edit_search_engine_dialog_ui_webui.h"
 #include "chrome/browser/ui/webui/task_manager_ui.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
 #include "chrome/browser/ui/webui/flash_ui.h"
@@ skipping 72 matching lines @@
 ChromeWebUI* NewWebUI<ExtensionWebUI>(TabContents* contents, const GURL& url) {
   // Don't use a WebUI for incognito tabs because we require extensions to run
   // within a single process.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (service && service->ExtensionBindingsAllowed(url))
     return new ExtensionWebUI(contents, url);
   return NULL;
 }
 
+// Special case for older about: handlers.
+template<>
+ChromeWebUI* NewWebUI<AboutUI>(TabContents* contents, const GURL& url) {
+  return new AboutUI(contents, url.host());
+}
+
 // Returns a function that can be used to create the right type of WebUI for a
 // tab, based on its URL. Returns NULL if the URL doesn't have WebUI associated
 // with it. Even if the factory function is valid, it may yield a NULL WebUI
 // when invoked for a particular tab - see NewWebUI<ExtensionWebUI>.
-static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
-                                                    const GURL& url) {
+WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
+                                             const GURL& url) {
   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.
@@ skipping 12 matching lines @@
     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>;
 
-  // 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 defined(OS_POSIX) && !defined(OS_MACOSX)
   if (url.host() == chrome::kChromeUICertificateViewerHost)
     return &NewWebUI<CertificateViewerUI>;
 #endif
@@ skipping 103 matching lines @@
     // If the sync promo page is enabled then use the sync promo WebUI otherwise
     // use the NTP WebUI. We don't want to return NULL if the sync promo page
     // is disabled because the page can be disabled mid-flight (for example,
     // if sync login finishes).
     if (SyncPromoUI::ShouldShowSyncPromo(profile))
       return &NewWebUI<SyncPromoUI>;
     else
       return &NewWebUI<NewTabUI>;
   }
 #endif
+
+  if (url.host() == chrome::kChromeUIChromeURLsHost ||
+      url.host() == chrome::kChromeUICreditsHost ||
+      url.host() == chrome::kChromeUIDNSHost ||
+      url.host() == chrome::kChromeUIHistogramsHost ||
+      url.host() == chrome::kChromeUIMemoryHost ||
+      url.host() == chrome::kChromeUIMemoryRedirectHost ||
+      url.host() == chrome::kChromeUIStatsHost ||
+      url.host() == chrome::kChromeUITaskManagerHost ||
+      url.host() == chrome::kChromeUITermsHost ||
+      url.host() == chrome::kChromeUIVersionHost) {
+    return &NewWebUI<AboutUI>;
+  }
+
+#if defined(USE_TCMALLOC)
+  if (url.host() == chrome::kChromeUITCMallocHost)

[Evan Stade, 2011/11/22 02:27:44]

nit: I would place these macro-guarded checks in the same block as the common
ones

[Tom Sepez, 2011/11/22 18:34:01]

Will do.  My personal preference has always been to do these at statement-level
boundaries where possible, but sure.

+    return &NewWebUI<AboutUI>;
+#endif
+
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+  if (url.host() == chrome::kChromeUILinuxProxyConfigHost ||
+      url.host() == chrome::kChromeUISandboxHost) {
+    return &NewWebUI<AboutUI>;
+    }
+#endif
+
+#if defined(OS_CHROMEOS)
+  if (url.host() == chrome::kChromeUICryptohomeHost ||
+      url.host() == chrome::kChromeUIDiscardsHost ||
+      url.host() == chrome::kChromeUINetworkHost ||
+      url.host() == chrome::kChromeUIOSCreditsHost) {
+    return &NewWebUI<AboutUI>;
+  }
+#endif
+
   DLOG(WARNING) << "Unknown WebUI:" << url;
   return NULL;
 }
 
 // When the test-type switch is set, return a TestType object, which should be a
 // subclass of Type. The logic is provided here in the traits class, rather than
 // in GetInstance() so that the choice is made only once, when the Singleton is
 // first instantiated, rather than every time GetInstance() is called.
 template<typename Type, typename TestType>
 struct PossibleTestSingletonTraits : public DefaultSingletonTraits<Type> {
@@ skipping 124 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;
 }