Upstream about:welcome page for Android.

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 e82a96844b88da214695483d504a9f06f809e356..7ec0ca76c0bdfde4858db8a8029fc201cc8e7412 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -15,6 +15,23 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 
+#if defined(OS_ANDROID)
+// static
+AboutAndroidApp::Callback AboutAndroidApp::label_getter_ = NULL;
+AboutAndroidApp::Callback AboutAndroidApp::version_name_getter_ = NULL;
+AboutAndroidApp::Callback AboutAndroidApp::version_code_getter_ = NULL;
+
+// static
+void AboutAndroidApp::RegisterGetters(
+    AboutAndroidApp::Callback label_getter,
+    AboutAndroidApp::Callback version_name_getter,
+    AboutAndroidApp::Callback version_code_getter) {
+  label_getter_ = label_getter;
+  version_name_getter_ = version_name_getter;
+  version_code_getter_ = version_code_getter;
+}
+#endif
+
 namespace {
 
 // Add paths here to be included in chrome://chrome-urls (about:about).
@@ -56,6 +73,9 @@ const char* const kChromePaths[] = {
   chrome::kChromeUITermsHost,
   chrome::kChromeUITracingHost,
   chrome::kChromeUIVersionHost,
+#if defined(OS_ANDROID)
+  chrome::kChromeUIWelcomeHost,
+#endif
 #if defined(OS_WIN)
   chrome::kChromeUIConflictsHost,
 #endif