Merge pull request #4601 from brave/issue_1422

Use brave download link and Brave brand in brave://flags for download
brave · May 6, 2020 · 3989f82 · 3989f82
2 parents 63f2d2d + d255080
commit 3989f82
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/common/BUILD.gn b/common/BUILD.gn
@@ -92,11 +92,14 @@ source_set("common") {
   }
 
   deps = [
+    "//base",
     ":network_constants",
     ":pref_names",
     ":shield_exceptions",
     ":switches",
     "//brave/chromium_src:common",
+    "//brave/components/resources",
+    "//components/resources",
     "//content/public/common",
     "//extensions/buildflags",
   ]

diff --git a/common/brave_content_client.cc b/common/brave_content_client.cc
@@ -5,12 +5,34 @@
 
 #include "brave/common/brave_content_client.h"
 
+#include <string>
+
+#include "base/memory/ref_counted_memory.h"
+#include "components/grit/brave_components_resources.h"
+#include "components/grit/components_resources.h"
 #include "content/public/common/url_constants.h"
 
 BraveContentClient::BraveContentClient() {}
 
 BraveContentClient::~BraveContentClient() {}
 
+base::RefCountedMemory* BraveContentClient::GetDataResourceBytes(
+    int resource_id) {
+  if (resource_id == IDR_FLAGS_UI_FLAGS_JS) {
+    auto* chromium_flags_ui_data =
+        ChromeContentClient::GetDataResourceBytes(resource_id);
+    auto* brave_flags_ui_data = ChromeContentClient::GetDataResourceBytes(
+        IDR_FLAGS_UI_BRAVE_FLAGS_OVERRIDES_JS);
+    std::string new_flags_js(chromium_flags_ui_data->front_as<const char>(),
+                             chromium_flags_ui_data->size());
+    new_flags_js.append(brave_flags_ui_data->front_as<const char>(),
+                        brave_flags_ui_data->size());
+    return new base::RefCountedStaticMemory(new_flags_js.c_str(),
+                                            new_flags_js.length());
+  }
+  return ChromeContentClient::GetDataResourceBytes(resource_id);
+}
+
 void BraveContentClient::AddAdditionalSchemes(Schemes* schemes) {
   ChromeContentClient::AddAdditionalSchemes(schemes);
   schemes->standard_schemes.push_back(content::kBraveUIScheme);

diff --git a/common/brave_content_client.h b/common/brave_content_client.h
@@ -13,6 +13,9 @@ class BraveContentClient : public ChromeContentClient {
   BraveContentClient();
   ~BraveContentClient() override;
 
+ private:
+  // ChromeContentClinet overrides:
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
   void AddAdditionalSchemes(Schemes* schemes) override;
 };
 

diff --git a/components/flags_ui/resources/brave_flags_overrides.js b/components/flags_ui/resources/brave_flags_overrides.js
@@ -0,0 +1,15 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+document.addEventListener('DOMContentLoaded', function() {
+  $('channel-promo-beta').innerHTML = `
+      Interested in cool new Brave features? Try our
+      <a href="https://brave.com/download-beta/">beta channel</a>.
+  `
+  $('channel-promo-dev').innerHTML = `
+      Interested in cool new Brave features? Try our
+      <a href="https://brave.com/download-beta/">dev channel</a>.
+  `
+});
diff --git a/components/resources/brave_components_resources.grd b/components/resources/brave_components_resources.grd
@@ -62,6 +62,7 @@
       </if>
 
       <part file="speedreader_resources.grdp" />
+      <part file="brave_flags_ui_resources.grdp" />
     </includes>
   </release>
 </grit>
diff --git a/components/resources/brave_flags_ui_resources.grdp b/components/resources/brave_flags_ui_resources.grdp
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit-part>
+  <include name="IDR_FLAGS_UI_BRAVE_FLAGS_OVERRIDES_JS" file="../flags_ui/resources/brave_flags_overrides.js" type="BINDATA" compress="gzip" />
+</grit-part>