From e847af57b96f621b98de1757f245c93149122868 Mon Sep 17 00:00:00 2001
From: Jocelyn Liu <yrliou@gmail.com>
Date: Fri, 29 Jun 2018 21:27:57 -0700
Subject: [PATCH 1/2] Add brave_page_visibility.js into chrome's settings
 resource

---
 lib/l10nUtil.js | 6 ++++++
 lib/util.js     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js
index e827aad8c47f..74af3682a962 100644
--- a/lib/l10nUtil.js
+++ b/lib/l10nUtil.js
@@ -40,6 +40,11 @@ const chromiumSettingsResourcesPath = path.resolve(path.join(srcDir, 'chrome', '
 
 const autoGeneratedWarning = '<!-- This file is created by l10nUtil.js. Do not edit manually. -->'
 
+const pageVisibility = '      <structure name="IDR_SETTINGS_PAGE_VISIBILITY_JS"\n'
+const bravePageVisibility = '      <structure name="IDR_SETTINGS_BRAVE_PAGE_VISIBILITY_JS"\n' +
+                            '                 file="brave_page_visibility.js"\n' +
+                            '                 type="chrome_html" />\n'
+
 module.exports.getSourceStringPaths = () => {
   return [
     braveStringsPath,
@@ -73,6 +78,7 @@ module.exports.rebaseBraveStringFilesOnChromiumL10nFiles = (path) =>
         .replace('<structure name="IDR_MD_EXTENSIONS_SIDEBAR_HTML"', '<structure name="IDR_MD_EXTENSIONS_SIDEBAR_HTML" preprocess="true"')
         .replace('<structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML"', '<structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML" preprocess="true"')
         .replace('<structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"', '<structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML" preprocess="true"')
+        .replace(pageVisibility, bravePageVisibility + pageVisibility)
         .replace(/settings_chromium_strings.grdp/g, 'settings_brave_strings.grdp')
         .replace(/The Chromium Authors/g, 'Brave Software Inc')
         .replace(/Google Chrome/g, 'Brave')
diff --git a/lib/util.js b/lib/util.js
index f6c1855f196c..c731e2030fe5 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -84,6 +84,7 @@ const util = {
     fs.copySync(path.join(braveAppDir, 'resources'), path.join(chromeAppDir, 'resources'))
     // Copy XTB files for brave/app/components_brave_strings.grd => components/components_chromium_strings.grd
     fs.copySync(path.join(braveAppDir, 'strings'), path.join(chromeComponentsDir, 'strings'))
+    fs.copySync(path.join(braveResourcesDir, 'settings', 'brave_page_visibility.js'), path.join(chromeResourcesDir, 'settings', 'brave_page_visibility.js'))
   },
 
   // Chromium compares pre-installed midl files and generated midl files from IDL during the build to check integrity.

From 6d83eb9c28937b9909163fc68239e1e4e1553f3c Mon Sep 17 00:00:00 2001
From: Jocelyn Liu <yrliou@gmail.com>
Date: Sun, 1 Jul 2018 10:23:40 -0700
Subject: [PATCH 2/2] add browser_resources

---
 lib/l10nUtil.js | 6 +++++-
 lib/util.js     | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js
index 74af3682a962..766a88a7e6ca 100644
--- a/lib/l10nUtil.js
+++ b/lib/l10nUtil.js
@@ -23,6 +23,7 @@ const braveMdExtensionsPartPath = path.resolve(path.join(srcDir, 'brave', 'app',
 
 const braveExtensionsResourcesPath = path.resolve(path.join(srcDir, 'brave', 'browser', 'resources', 'md_extensions', 'extensions_resources.grd'))
 const braveSettingsResourcesPath = path.resolve(path.join(srcDir, 'brave', 'browser', 'resources', 'settings', 'settings_resources.grd'))
+const braveBrowserResourcesPath = path.resolve(path.join(srcDir, 'brave', 'browser', 'browser_resources.grd'))
 
 // Chromium string paths
 const chromiumStringsPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'chromium_strings.grd'))
@@ -37,6 +38,7 @@ const chromiumMdExtensionsPartPath = path.resolve(path.join(srcDir, 'chrome', 'a
 
 const chromiumExtensionsResourcesPath = path.resolve(path.join(srcDir, 'chrome', 'browser', 'resources', 'md_extensions', 'extensions_resources.grd'))
 const chromiumSettingsResourcesPath = path.resolve(path.join(srcDir, 'chrome', 'browser', 'resources', 'settings', 'settings_resources.grd'))
+const chromiumBrowserResourcesPath = path.resolve(path.join(srcDir, 'chrome', 'browser', 'browser_resources.grd'))
 
 const autoGeneratedWarning = '<!-- This file is created by l10nUtil.js. Do not edit manually. -->'
 
@@ -70,7 +72,8 @@ module.exports.rebaseBraveStringFilesOnChromiumL10nFiles = (path) =>
     [chromiumSettingsStringsPartPath]: braveSettingsStringsPartPath,
     [chromiumMdExtensionsPartPath]: braveMdExtensionsPartPath,
     [chromiumExtensionsResourcesPath]: braveExtensionsResourcesPath,
-    [chromiumSettingsResourcesPath]: braveSettingsResourcesPath
+    [chromiumSettingsResourcesPath]: braveSettingsResourcesPath,
+    [chromiumBrowserResourcesPath]: braveBrowserResourcesPath
   }).forEach(([sourcePath, destPath]) =>
     fs.writeFileSync(destPath,
       fs.readFileSync(sourcePath, 'utf8')
@@ -78,6 +81,7 @@ module.exports.rebaseBraveStringFilesOnChromiumL10nFiles = (path) =>
         .replace('<structure name="IDR_MD_EXTENSIONS_SIDEBAR_HTML"', '<structure name="IDR_MD_EXTENSIONS_SIDEBAR_HTML" preprocess="true"')
         .replace('<structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML"', '<structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML" preprocess="true"')
         .replace('<structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"', '<structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML" preprocess="true"')
+        .replace('<include name="IDR_MD_HISTORY_SIDE_BAR_HTML"', '<include name="IDR_MD_HISTORY_SIDE_BAR_HTML" flattenhtml="true"')
         .replace(pageVisibility, bravePageVisibility + pageVisibility)
         .replace(/settings_chromium_strings.grdp/g, 'settings_brave_strings.grdp')
         .replace(/The Chromium Authors/g, 'Brave Software Inc')
diff --git a/lib/util.js b/lib/util.js
index c731e2030fe5..63764cb5daac 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -60,6 +60,8 @@ const util = {
     const braveAppDir = path.join(config.projects['brave-core'].dir, 'app')
     const chromeResourcesDir = path.join(config.srcDir, 'chrome', 'browser', 'resources')
     const braveResourcesDir = path.join(config.projects['brave-core'].dir, 'browser', 'resources')
+    const chromeBrowserDir = path.join(config.srcDir, 'chrome', 'browser')
+    const braveBrowserDir = path.join(config.projects['brave-core'].dir, 'browser')
 
     fs.copySync(path.join(braveAppDir, 'brave_strings.grd'), path.join(chromeAppDir, 'brave_strings.grd'))
     fs.copySync(path.join(braveAppDir, 'settings_brave_strings.grdp'), path.join(chromeAppDir, 'settings_brave_strings.grdp'))
@@ -71,6 +73,7 @@ const util = {
     fs.copySync(path.join(braveAppDir, 'md_extensions_strings.grdp'), path.join(chromeAppDir, 'md_extensions_strings.grdp'))
     fs.copySync(path.join(braveResourcesDir, 'md_extensions', 'extensions_resources.grd'), path.join(chromeResourcesDir, 'md_extensions', 'extensions_resources.grd'))
     fs.copySync(path.join(braveResourcesDir, 'settings', 'settings_resources.grd'), path.join(chromeResourcesDir, 'settings', 'settings_resources.grd'))
+    fs.copySync(path.join(braveBrowserDir, 'browser_resources.grd'), path.join(chromeBrowserDir, 'browser_resources.grd'))
     fs.copySync(path.join(braveAppDir, 'components_brave_strings.grd'), path.join(config.srcDir, 'components', 'components_brave_strings.grd'))
     fs.copySync(path.join(braveAppDir, 'theme', 'brave'), path.join(chromeAppDir, 'theme', 'brave'))
     fs.copySync(path.join(braveAppDir, 'theme', 'default_100_percent', 'brave'), path.join(chromeAppDir, 'theme', 'default_100_percent', 'brave'))