From 2c943d7763a736120109345c323a86c89862cd66 Mon Sep 17 00:00:00 2001
From: Simon Hong <shong@igalia.com>
Date: Fri, 10 Jan 2020 10:53:55 +0900
Subject: [PATCH] Replace bookmark manager empty list string

fix https://github.com/brave/brave-browser/issues/2494
---
 app/brave_generated_resources.grd                |  3 +++
 .../browser/ui/webui/bookmarks/bookmarks_ui.cc   | 10 ++++++++++
 ...wser-ui-webui-bookmarks-bookmarks_ui.cc.patch | 16 ++++++++--------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
index 40635c57456a7..a26e8a93e6784 100644
--- a/app/brave_generated_resources.grd
+++ b/app/brave_generated_resources.grd
@@ -700,6 +700,9 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
           Bookmark All Tabs...
         </message>
       </if>
+      <message name="IDS_BRAVE_BOOKMARK_MANAGER_EMPTY_LIST" desc="">
+        To add a bookmark, click the bookmark button next to the address bar
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
index f9f07dab0a919..18e1b978bda6d 100644
--- a/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
+++ b/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
@@ -4,14 +4,24 @@
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include "brave/browser/ui/webui/navigation_bar_data_provider.h"
+#include "brave/grit/brave_generated_resources.h"
+#include "content/public/browser/web_ui_data_source.h"
 
 namespace {
 
 void BraveCustomizeBookmarksDataSource(content::WebUIDataSource* source) {
   NavigationBarDataProvider::Initialize(source);
+
+  // Replace strings.
+  source->AddLocalizedString(
+      "emptyList", IDS_BRAVE_BOOKMARK_MANAGER_EMPTY_LIST);
 }
 
 }  // namespace
 
+#define BRAVE_CUSTOMIZE_BOOKMARKS_DATA_SOURCE(source) \
+  BraveCustomizeBookmarksDataSource(source);
+
 #include "../../../../../../chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc"  // NOLINT
 
+#undef BRAVE_CUSTOMIZE_BOOKMARKS_DATA_SOURCE
diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
index fb2588442e5f5..05188c8a8283b 100644
--- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
-index 094a943ac95d0f159b223d3948e3b2e4b1759e76..f378bfe93dcaa890abb2221e5f3ffbfd45401fe0 100644
+index 094a943ac95d0f159b223d3948e3b2e4b1759e76..0e88121e10b4016618a11ff530beebb8009e60eb 100644
 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
 +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
-@@ -46,6 +46,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) {
-   content::WebUIDataSource* source =
-       content::WebUIDataSource::Create(chrome::kChromeUIBookmarksHost);
+@@ -174,6 +174,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) {
+ 
+   source->UseStringsJs();
+ 
++  BRAVE_CUSTOMIZE_BOOKMARKS_DATA_SOURCE(source)
+   return source;
+ }
  
-+  BraveCustomizeBookmarksDataSource(source);
-   // Build an Accelerator to describe undo shortcut
-   // NOTE: the undo shortcut is also defined in bookmarks/command_manager.js
-   // TODO(crbug/893033): de-duplicate shortcut by moving all shortcut