Index: chrome/common/url_constants.cc |
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc |
index 916375ff9238df2430557999fcf24581877b4280..7808a0161c58acacb1ab7e942bd8a631ada10a14 100644 |
--- a/chrome/common/url_constants.cc |
+++ b/chrome/common/url_constants.cc |
@@ -565,36 +565,38 @@ const char* const kChromeHostURLs[] = { |
kChromeUIComponentsHost, |
kChromeUICrashesHost, |
kChromeUICreditsHost, |
-#if defined(ENABLE_SERVICE_DISCOVERY) |
- kChromeUIDevicesHost, |
-#endif |
kChromeUIDNSHost, |
kChromeUIFlagsHost, |
- kChromeUIGCMInternalsHost, |
- kChromeUIHelpHost, |
kChromeUIHistoryHost, |
kChromeUIInvalidationsHost, |
- kChromeUIIPCHost, |
kChromeUIMemoryHost, |
kChromeUIMemoryInternalsHost, |
-#if defined(OS_ANDROID) || defined(OS_IOS) |
- kChromeUINetExportHost, |
-#endif |
kChromeUINetInternalsHost, |
kChromeUINewTabHost, |
kChromeUIOmniboxHost, |
kChromeUIPredictorsHost, |
kChromeUIProfilerHost, |
- kChromeUIQuotaInternalsHost, |
kChromeUISignInInternalsHost, |
kChromeUIStatsHost, |
kChromeUISyncInternalsHost, |
- kChromeUISystemInfoHost, |
kChromeUITermsHost, |
kChromeUITranslateInternalsHost, |
- kChromeUIUberHost, |
kChromeUIUserActionsHost, |
kChromeUIVersionHost, |
+ content::kChromeUIAccessibilityHost, |
+ content::kChromeUIAppCacheInternalsHost, |
+ content::kChromeUIBlobInternalsHost, |
+ content::kChromeUIGpuHost, |
+ content::kChromeUIHistogramHost, |
+ content::kChromeUIIndexedDBInternalsHost, |
+ content::kChromeUIMediaInternalsHost, |
+ content::kChromeUINetworkViewCacheHost, |
+ content::kChromeUIServiceWorkerInternalsHost, |
+ content::kChromeUITracingHost, |
+ content::kChromeUIWebRTCInternalsHost, |
+#if defined(OS_ANDROID) || defined(OS_IOS) |
Peter Kasting
2014/05/15 23:02:18
Tiny nit: Maybe alphabetical order of OS names?
O
Maria
2014/05/16 00:20:50
Done.
|
+ kChromeUINetExportHost, |
+#endif |
#if defined(OS_ANDROID) |
kChromeUIWelcomeHost, |
#else |
@@ -602,9 +604,15 @@ const char* const kChromeHostURLs[] = { |
kChromeUIBookmarksHost, |
kChromeUIDownloadsHost, |
kChromeUIFlashHost, |
+ kChromeUIGCMInternalsHost, |
+ kChromeUIHelpHost, |
kChromeUIInspectHost, |
+ kChromeUIIPCHost, |
kChromeUIPluginsHost, |
+ kChromeUIQuotaInternalsHost, |
kChromeUISettingsHost, |
+ kChromeUISystemInfoHost, |
+ kChromeUIUberHost, |
#endif |
#if defined(OS_WIN) |
kChromeUIConflictsHost, |
@@ -642,17 +650,9 @@ const char* const kChromeHostURLs[] = { |
#if defined(ENABLE_FULL_PRINTING) |
kChromeUIPrintHost, |
#endif |
- content::kChromeUIAccessibilityHost, |
- content::kChromeUIAppCacheInternalsHost, |
- content::kChromeUIBlobInternalsHost, |
- content::kChromeUIGpuHost, |
- content::kChromeUIHistogramHost, |
- content::kChromeUIIndexedDBInternalsHost, |
- content::kChromeUIMediaInternalsHost, |
- content::kChromeUINetworkViewCacheHost, |
- content::kChromeUIServiceWorkerInternalsHost, |
- content::kChromeUITracingHost, |
- content::kChromeUIWebRTCInternalsHost, |
+#if defined(ENABLE_SERVICE_DISCOVERY) |
+ kChromeUIDevicesHost, |
+#endif |
#if defined(ENABLE_WEBRTC) |
kChromeUIWebRtcLogsHost, |
#endif |