Merge pull request #52 from brave/welcome-fixes

Welcome page fixes
brave · Mar 5, 2018 · 644233d · 644233d
2 parents 0f39310 + e14fd43
commit 644233d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
@@ -13,9 +13,10 @@
 namespace {
 
 bool HandleURLRewrite(GURL* url,
-                            content::BrowserContext* browser_context) {
+                      content::BrowserContext* browser_context) {
   if (url->SchemeIs(content::kChromeUIScheme) &&
-      url->host() == chrome::kChromeUIWelcomeHost) {
+      (url->host() == chrome::kChromeUIWelcomeHost ||
+       url->host() == chrome::kChromeUIWelcomeWin10Host)) {
     *url = GURL(kWelcomeRemoteURL);
     return true;
   }
@@ -30,12 +31,15 @@ bool HandleURLRewrite(GURL* url,
 }
 
 bool HandleURLReverseRewrite(GURL* url,
-                                   content::BrowserContext* browser_context) {
+                             content::BrowserContext* browser_context) {
   // Handle mapping new tab URL to ourselves
   if (url->SchemeIs(content::kChromeUIScheme) &&
       url->host() == chrome::kChromeUINewTabHost) {
     return true;
   }
+  if (url->spec() == kWelcomeRemoteURL) {
+    return true;
+  }
   return false;
 }
 

diff --git a/common/webui_url_constants.cc b/common/webui_url_constants.cc
@@ -3,4 +3,4 @@
 const char kPaymentsHost[] = "payments";
 const char kPaymentsJS[] = "brave_payments.js";
 const char kBraveNewTabJS[] = "brave_new_tab.js";
-const char kWelcomeRemoteURL[] = "https://brave.com/welcome.html";
+const char kWelcomeRemoteURL[] = "https://brave.com/welcome/";