Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3226)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 714413006: Cleanup: Organize GetWebUIFactoryFunction(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index d6d0c66cc9bd9c61a643f1c160eef06db392d5b2..2dd799599193ffb413efa2de38ee255b429dcd7e 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -240,6 +240,27 @@ bool NeedsExtensionWebUI(Profile* profile, const GURL& url) {
}
#endif
+bool IsAboutUI(const GURL& url) {
+ return (url.host() == chrome::kChromeUIChromeURLsHost ||
+ url.host() == chrome::kChromeUICreditsHost ||
+ url.host() == chrome::kChromeUIDNSHost ||
+ url.host() == chrome::kChromeUIMemoryHost ||
+ url.host() == chrome::kChromeUIMemoryRedirectHost ||
+ url.host() == chrome::kChromeUIStatsHost
+#if !defined(OS_ANDROID)
+ || url.host() == chrome::kChromeUITermsHost
+#endif
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+ || url.host() == chrome::kChromeUILinuxProxyConfigHost
+ || url.host() == chrome::kChromeUISandboxHost
+#endif
+#if defined(OS_CHROMEOS)
+ || url.host() == chrome::kChromeUIDiscardsHost
+ || url.host() == chrome::kChromeUIOSCreditsHost
+#endif
+ ); // NOLINT
+}
+
// 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.
@@ -277,11 +298,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<ConstrainedWebDialogUI>;
if (url.host() == chrome::kChromeUICrashesHost)
return &NewWebUI<CrashesUI>;
-#if defined(ENABLE_SERVICE_DISCOVERY)
- if (url.host() == chrome::kChromeUIDevicesHost) {
- return &NewWebUI<LocalDiscoveryUI>;
- }
-#endif
if (url.host() == chrome::kChromeUIDomainReliabilityInternalsHost)
return &NewWebUI<DomainReliabilityInternalsUI>;
if (url.host() == chrome::kChromeUIFlagsHost)
@@ -298,20 +314,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<ConstrainedWebDialogUI>;
if (url.host() == chrome::kChromeUIMemoryInternalsHost)
return &NewWebUI<MemoryInternalsUI>;
-#if !defined(DISABLE_NACL)
- if (url.host() == chrome::kChromeUINaClHost)
- return &NewWebUI<NaClUI>;
-#endif
-#if defined(OS_ANDROID) || defined(OS_IOS)
- if (url.host() == chrome::kChromeUINetExportHost)
- return &NewWebUI<NetExportUI>;
-#endif
if (url.host() == chrome::kChromeUINetInternalsHost)
return &NewWebUI<NetInternalsUI>;
-#if !defined(OS_ANDROID)
- if (url.host() == chrome::kChromeUINewTabHost)
- return &NewWebUI<NewTabUI>;
-#endif
if (url.host() == chrome::kChromeUIOmniboxHost)
return &NewWebUI<OmniboxUI>;
if (url.host() == chrome::kChromeUIPasswordManagerInternalsHost)
@@ -332,18 +336,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<UserActionsUI>;
if (url.host() == chrome::kChromeUIVersionHost)
return &NewWebUI<VersionUI>;
-#if defined(ENABLE_EXTENSIONS)
- if (url.host() == chrome::kChromeUIVoiceSearchHost)
- return &NewWebUI<VoiceSearchUI>;
-#endif
-#if defined(ENABLE_WEBRTC)
- if (url.host() == chrome::kChromeUIWebRtcLogsHost)
- return &NewWebUI<WebRtcLogsUI>;
-#endif
-#if defined(ENABLE_APP_LIST)
- if (url.host() == chrome::kChromeUIAppListStartPageHost)
- return &NewWebUI<app_list::StartPageUI>;
-#endif
/****************************************************************************
* OS Specific #defines
@@ -372,6 +364,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
// Identity API is not available on Android.
if (url.host() == chrome::kChromeUIIdentityInternalsHost)
return &NewWebUI<IdentityInternalsUI>;
+ if (url.host() == chrome::kChromeUINewTabHost)
+ return &NewWebUI<NewTabUI>;
// Android does not support plugins for now.
if (url.host() == chrome::kChromeUIPluginsHost)
return &NewWebUI<PluginsUI>;
@@ -397,21 +391,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
// Uber page is not used on Android.
if (url.host() == chrome::kChromeUIUberHost)
return &NewWebUI<UberUI>;
-#endif
+#endif // !defined(OS_ANDROID)
#if defined(OS_WIN)
if (url.host() == chrome::kChromeUIConflictsHost)
return &NewWebUI<ConflictsUI>;
if (url.host() == chrome::kChromeUIMetroFlowHost)
return &NewWebUI<SetAsDefaultBrowserUI>;
#endif
-#if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
- if (url.host() == chrome::kChromeUICertificateViewerHost)
- return &NewWebUI<CertificateViewerUI>;
-#if defined(OS_CHROMEOS)
- if (url.host() == chrome::kChromeUICertificateViewerDialogHost)
- return &NewWebUI<CertificateViewerModalDialogUI>;
-#endif
-#endif
#if defined(OS_CHROMEOS)
if (url.host() == chrome::kChromeUIBluetoothPairingHost)
return &NewWebUI<chromeos::BluetoothPairingUI>;
@@ -458,7 +444,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
if (url.host() == chrome::kChromeUIPowerHost)
return &NewWebUI<chromeos::PowerUI>;
#endif // defined(OS_CHROMEOS)
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS)
+ if (url.host() == chrome::kChromeUINetExportHost)
+ return &NewWebUI<NetExportUI>;
+#else
if (url.host() == chrome::kChromeUIChromeSigninHost)
return &NewWebUI<InlineLoginUI>;
if (url.SchemeIs(content::kChromeDevToolsScheme))
@@ -469,63 +458,59 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
if (url.host() == chrome::kChromeUIInspectHost)
return &NewWebUI<InspectUI>;
#endif
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
+ if (url.host() == chrome::kChromeUIUserManagerHost &&
+ switches::IsNewAvatarMenu()) {
+ return &NewWebUI<UserManagerUI>;
+ }
+#endif
/****************************************************************************
* Other #defines and special logics.
***************************************************************************/
-#if defined(ENABLE_CONFIGURATION_POLICY)
- if (url.host() == chrome::kChromeUIPolicyHost)
- return &NewWebUI<PolicyUI>;
-
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
- if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
- return &NewWebUI<ProfileSigninConfirmationUI>;
+#if !defined(DISABLE_NACL)
+ if (url.host() == chrome::kChromeUINaClHost)
+ return &NewWebUI<NaClUI>;
#endif
-
-#endif // defined(ENABLE_CONFIGURATION_POLICY)
-
#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
return &NewWebUI<ConstrainedWebDialogUI>;
}
#endif
-
#if defined(USE_AURA)
if (url.host() == chrome::kChromeUIGestureConfigHost)
return &NewWebUI<GestureConfigUI>;
#endif
-
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
- if (url.host() == chrome::kChromeUIUserManagerHost &&
- switches::IsNewAvatarMenu()) {
- return &NewWebUI<UserManagerUI>;
- }
-#endif
-
- if (url.host() == chrome::kChromeUIChromeURLsHost ||
- url.host() == chrome::kChromeUICreditsHost ||
- url.host() == chrome::kChromeUIDNSHost ||
- url.host() == chrome::kChromeUIMemoryHost ||
- url.host() == chrome::kChromeUIMemoryRedirectHost ||
- url.host() == chrome::kChromeUIStatsHost
-#if !defined(OS_ANDROID)
- || url.host() == chrome::kChromeUITermsHost
-#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
- || url.host() == chrome::kChromeUILinuxProxyConfigHost
- || url.host() == chrome::kChromeUISandboxHost
-#endif
+#if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
+ if (url.host() == chrome::kChromeUICertificateViewerHost)
+ return &NewWebUI<CertificateViewerUI>;
#if defined(OS_CHROMEOS)
- || url.host() == chrome::kChromeUIDiscardsHost
- || url.host() == chrome::kChromeUIOSCreditsHost
+ if (url.host() == chrome::kChromeUICertificateViewerDialogHost)
+ return &NewWebUI<CertificateViewerModalDialogUI>;
#endif
- ) {
+#endif // (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
+
+ if (IsAboutUI(url))
return &NewWebUI<AboutUI>;
Dan Beam 2014/11/19 20:10:00 why is this here? why not after all the #if defin
Lei Zhang 2014/11/19 20:17:56 Sure, I'll move it down to just above IsEnableDomD
- }
+#if defined(ENABLE_CONFIGURATION_POLICY)
+ if (url.host() == chrome::kChromeUIPolicyHost)
+ return &NewWebUI<PolicyUI>;
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
+ return &NewWebUI<ProfileSigninConfirmationUI>;
+#endif
+#endif // defined(ENABLE_CONFIGURATION_POLICY)
+
+#if defined(ENABLE_APP_LIST)
+ if (url.host() == chrome::kChromeUIAppListStartPageHost)
+ return &NewWebUI<app_list::StartPageUI>;
+#endif
#if defined(ENABLE_EXTENSIONS)
if (url.host() == chrome::kChromeUIExtensionsFrameHost)
return &NewWebUI<extensions::ExtensionsUI>;
+ if (url.host() == chrome::kChromeUIVoiceSearchHost)
+ return &NewWebUI<VoiceSearchUI>;
#endif
#if defined(ENABLE_PRINT_PREVIEW)
if (url.host() == chrome::kChromeUIPrintHost &&
@@ -533,6 +518,15 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<PrintPreviewUI>;
}
#endif
+#if defined(ENABLE_SERVICE_DISCOVERY)
+ if (url.host() == chrome::kChromeUIDevicesHost) {
+ return &NewWebUI<LocalDiscoveryUI>;
+ }
+#endif
+#if defined(ENABLE_WEBRTC)
+ if (url.host() == chrome::kChromeUIWebRtcLogsHost)
+ return &NewWebUI<WebRtcLogsUI>;
+#endif
if (IsEnableDomDistillerSet() &&
url.host() == dom_distiller::kChromeUIDomDistillerHost) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698