[Android] Exclude unsupported URLs from chrome://chrome-urls.

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 8ea02a9c1565a3bd2f496bc456b2a4e92d3b74a5..76dc6109b57f6d1b60e7eef021740bd9c5774d39 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -22,41 +22,40 @@ namespace {
 const char* const kChromePaths[] = {
   chrome::kChromeUIAppCacheInternalsHost,
   chrome::kChromeUIBlobInternalsHost,
-  chrome::kChromeUIBookmarksHost,

[Nico, 2012/09/25 01:56:29]

I believe about:about lists urls in the order they are in in this array, and the
intent is to have them sorted alphabetically. Can you keep them in the current
order?

[msw, 2012/09/25 02:23:05]

The ordering seems fine. These identifiers are sorted so devs can more easily
update the list; putting preprocessor blocks at the end and sorting within each
block seems to be the norm.

The path strings themselves (which may not match their identifiers) should be
sorted separately in ChromePaths() or elsewhere so users get a sorted list of
links. I'll address that tangential issue in a separate CL.

   chrome::kChromeUICacheHost,
   chrome::kChromeUIChromeURLsHost,
   chrome::kChromeUICrashesHost,
   chrome::kChromeUICreditsHost,
   chrome::kChromeUIDNSHost,
-  chrome::kChromeUIDownloadsHost,
-  chrome::kChromeUIExtensionsHost,
-  chrome::kChromeUIFlagsHost,
-  chrome::kChromeUIFlashHost,
   chrome::kChromeUIGpuInternalsHost,
   chrome::kChromeUIHistoryHost,
   chrome::kChromeUIIPCHost,
-  chrome::kChromeUIInspectHost,
   chrome::kChromeUIMediaInternalsHost,
   chrome::kChromeUIMemoryHost,
-  chrome::kChromeUINaClHost,
   chrome::kChromeUINetInternalsHost,
   chrome::kChromeUINetworkViewCacheHost,
   chrome::kChromeUINewTabHost,
   chrome::kChromeUIOmniboxHost,
-  chrome::kChromeUIPluginsHost,
-  chrome::kChromeUIPolicyHost,
   chrome::kChromeUIPredictorsHost,
   chrome::kChromeUIProfilerHost,
   chrome::kChromeUIQuotaInternalsHost,
-  chrome::kChromeUISettingsHost,
   chrome::kChromeUIStatsHost,
   chrome::kChromeUISyncInternalsHost,
-#if defined(OS_CHROMEOS)
-  chrome::kChromeUITaskManagerHost,
-#endif
   chrome::kChromeUITermsHost,
-  chrome::kChromeUITracingHost,
   chrome::kChromeUIVersionHost,
+#if defined(OS_ANDROID)
+  chrome::kChromeUIWelcomeHost,
+#else
+  chrome::kChromeUIBookmarksHost,
+  chrome::kChromeUIDownloadsHost,
+  // TODO(satish): Enable after http://crbug.com/143146 is fixed.

[Nico, 2012/09/25 01:56:29]

nit: Do you think having TODOs on satish is useful?

[newt (away), 2012/09/25 02:36:57]

Fair point.  In fact, the bug's been reassigned to dfalcantara.

+  chrome::kChromeUIFlagsHost,
+  chrome::kChromeUIFlashHost,
+  chrome::kChromeUIInspectHost,
+  chrome::kChromeUIPluginsHost,
+  chrome::kChromeUISettingsHost,
+  chrome::kChromeUITracingHost,
+#endif
 #if defined(OS_WIN)
   chrome::kChromeUIConflictsHost,
 #endif
@@ -78,8 +77,18 @@ const char* const kChromePaths[] = {
   chrome::kChromeUIOSCreditsHost,
   chrome::kChromeUIProxySettingsHost,
   chrome::kChromeUISystemInfoHost,
+  chrome::kChromeUITaskManagerHost,
   chrome::kChromeUIWallpaperHost,
 #endif
+#if !defined(DISABLE_NACL)
+  chrome::kChromeUINaClHost,
+#endif
+#if defined(ENABLE_CONFIGURATION_POLICY)
+  chrome::kChromeUIPolicyHost,
+#endif
+#if defined(ENABLE_EXTENSIONS)
+  chrome::kChromeUIExtensionsHost,
+#endif
 #if defined(ENABLE_PRINTING)
   chrome::kChromeUIPrintHost,
 #endif