Index: chrome/browser/android/new_tab_page_url_handler.cc |
diff --git a/chrome/browser/android/new_tab_page_url_handler.cc b/chrome/browser/android/new_tab_page_url_handler.cc |
index 8561c228c60d8a0094c6aa1643bc512a0b64bf2b..da57f5798b37f67b91e57072eec7c7da0e327d65 100644 |
--- a/chrome/browser/android/new_tab_page_url_handler.cc |
+++ b/chrome/browser/android/new_tab_page_url_handler.cc |
@@ -13,6 +13,7 @@ |
namespace { |
const char kBookmarkFolderPath[] = "folder/"; |
+const char kLegacyWelcomeHost[] = "welcome"; |
} |
namespace chrome { |
@@ -20,10 +21,14 @@ namespace android { |
bool HandleAndroidNativePageURL(GURL* url, |
content::BrowserContext* browser_context) { |
- if (url->SchemeIs(content::kChromeUIScheme) && |
- url->host() == chrome::kChromeUINewTabHost) { |
- *url = GURL(chrome::kChromeUINativeNewTabURL); |
- return true; |
+ if (url->SchemeIs(content::kChromeUIScheme)) { |
+ // TODO(newt): stop redirecting chrome://welcome to chrome-native://newtab |
+ // when M39 is a distant memory. http://crbug.com/455427 |
+ if (url->host() == chrome::kChromeUINewTabHost || |
+ url->host() == kLegacyWelcomeHost) { |
+ *url = GURL(chrome::kChromeUINativeNewTabURL); |
+ return true; |
+ } |
} |
if (url->SchemeIs(chrome::kChromeNativeScheme) && |