From e4db2bc733ac707fa34465ae97d3e3eb57d3d939 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Tue, 13 Aug 2019 23:38:08 -0700
Subject: [PATCH 1/2] Add `Get more extension` link to brave://settings

Fixes https://github.com/brave/brave-browser/issues/5540
---
 app/brave_generated_resources.grd                   |  7 +++++++
 .../brave_default_extensions_page.html              |  7 +++++++
 .../brave_default_extensions_page.js                |  4 ++++
 .../settings/settings_localized_strings_provider.cc | 13 ++++++++++++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
index 6c79e189d79d..2d9b86ab4be1 100644
--- a/app/brave_generated_resources.grd
+++ b/app/brave_generated_resources.grd
@@ -443,6 +443,13 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL" desc="The label of manage extensions link in settings">
         Manage extensions
       </message>
+
+      <message name="IDS_SETTINGS_GET_MORE_EXTENSIONS_LABEL" desc="The label of get more extensions link in settings">
+        Get more extensions
+      </message>
+      <message name="IDS_SETTINGS_GET_MORE_EXTENSIONS_SUBLABEL" desc="The sub-label of get more extensions link in settings">
+        Open Web Store
+      </message>
       <!-- Extensions page strings -->
       <message name="IDS_MD_EXTENSIONS_BRAVE_ITEM_SOURCE_WEBSTORE" desc="The text to indicate that an extension is from the Web Extensions Store.">
         Web Extensions Store
diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
index 9f31e33c8c4b..bf8b610f6791 100644
--- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
+++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
@@ -98,6 +98,13 @@
         label="$i18n{manageExtensionsLabel}" on-click="openExtensionsPage_">
       </cr-link-row>
     </div>
+    <div class="settings-row" id="getMoreExtensionsRow">
+      <cr-link-row
+        label="$i18n{getMoreExtensionsLabel}"
+        sub-label="$i18n{getMoreExtensionsSubLabel}"
+        on-click="openWebStoreUrl_" external>
+      </cr-link-row>
+    </div>
   <template is="dom-if" if="{{ showRestartToast }}">
     <div id="needsRestart">
         <div class="flex-container">
diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js
index 2dabff053d5f..6af440e50a27 100644
--- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js
+++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js
@@ -63,5 +63,9 @@ Polymer({
   openExtensionsPage_: function() {
     window.open("chrome://extensions", "_self");
   },
+
+  openWebStoreUrl_: function() {
+    window.open(loadTimeData.getString('getMoreExtensionsUrl'));
+  },
 });
 })();
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 5e953ad4cd50..df8be4eb54be 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -14,6 +14,7 @@ void BraveAddLocalizedStrings(content::WebUIDataSource*, Profile*);
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "extensions/common/extension_urls.h"
 
 #undef IDS_SETTINGS_EDIT_PERSON
 #define IDS_SETTINGS_EDIT_PERSON IDS_SETTINGS_BRAVE_EDIT_PROFILE
@@ -146,12 +147,22 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
     {"relaunchButtonLabel",
       IDS_SETTINGS_RELAUNCH_BUTTON_LABEL},
     {"manageExtensionsLabel",
-      IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL}
+      IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL},
+    {"getMoreExtensionsLabel",
+      IDS_SETTINGS_GET_MORE_EXTENSIONS_LABEL},
+    {"getMoreExtensionsSubLabel",
+      IDS_SETTINGS_GET_MORE_EXTENSIONS_SUBLABEL}
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           base::size(localized_strings));
   html_source->AddString("webRTCLearnMoreURL",
       base::ASCIIToUTF16(kWebRTCLearnMoreURL));
+  html_source->AddString("getMoreExtensionsUrl",
+    base::ASCIIToUTF16(
+      google_util::AppendGoogleLocaleParam(
+                GURL(extension_urls::GetWebstoreExtensionsCategoryURL()),
+                g_browser_process->GetApplicationLocale())
+                .spec()));
 }
 
 void BraveAddResources(content::WebUIDataSource* html_source,

From fdf4cb8f9c50e8cb6c2c169be8beb24d23db8ae4 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Tue, 20 Aug 2019 12:44:41 -0700
Subject: [PATCH 2/2] Remove string in favor of existing one on extensions page

---
 app/brave_generated_resources.grd                           | 6 +-----
 .../webui/settings/settings_localized_strings_provider.cc   | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
index 2d9b86ab4be1..904bb94bb46e 100644
--- a/app/brave_generated_resources.grd
+++ b/app/brave_generated_resources.grd
@@ -443,13 +443,9 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL" desc="The label of manage extensions link in settings">
         Manage extensions
       </message>
-
-      <message name="IDS_SETTINGS_GET_MORE_EXTENSIONS_LABEL" desc="The label of get more extensions link in settings">
+      <message name="IDS_BRAVE_SETTINGS_GET_MORE_EXTENSIONS_LABEL" desc="The label of get more extensions link in settings">
         Get more extensions
       </message>
-      <message name="IDS_SETTINGS_GET_MORE_EXTENSIONS_SUBLABEL" desc="The sub-label of get more extensions link in settings">
-        Open Web Store
-      </message>
       <!-- Extensions page strings -->
       <message name="IDS_MD_EXTENSIONS_BRAVE_ITEM_SOURCE_WEBSTORE" desc="The text to indicate that an extension is from the Web Extensions Store.">
         Web Extensions Store
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index df8be4eb54be..0c067d8834bf 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -149,9 +149,9 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
     {"manageExtensionsLabel",
       IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL},
     {"getMoreExtensionsLabel",
-      IDS_SETTINGS_GET_MORE_EXTENSIONS_LABEL},
+      IDS_BRAVE_SETTINGS_GET_MORE_EXTENSIONS_LABEL},
     {"getMoreExtensionsSubLabel",
-      IDS_SETTINGS_GET_MORE_EXTENSIONS_SUBLABEL}
+      IDS_EXTENSIONS_SIDEBAR_OPEN_CHROME_WEB_STORE}
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           base::size(localized_strings));