Upstream about:welcome page for Android.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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 48e63b0693fec2e0d952e1e43a717cf4a3db0c20..d97e9216f7424cc95f515968fd67347fe2671115 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -48,6 +48,7 @@
 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
+#include "chrome/browser/ui/webui/welcome_ui_android.h"

[Evan Stade, 2012/08/10 02:40:01]

inside ifdef please.

[newt (away), 2012/08/10 20:49:43]

Done.

 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
@@ -226,6 +227,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   /****************************************************************************
    * OS Specific #defines
    ***************************************************************************/
+#if defined(OS_ANDROID)
+  if (url.host() == chrome::kChromeUIWelcomeHost)
+    return &NewWebUI<WelcomeUI>;
+#endif

[Evan Stade, 2012/08/10 02:40:01]

you can use #else

[newt (away), 2012/08/10 20:49:43]

Done.

 #if !defined(OS_ANDROID)
   // These pages are implemented with native UI elements on Android.
   if (url.host() == chrome::kChromeUIDownloadsHost)