Merge pull request #462 from brave/branding_settings_history

Branding in settings and history pages
brave · Jul 3, 2018 · 1b61377 · 1b61377
2 parents 33d610e + 6d83eb9
commit 1b61377
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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,9 +38,15 @@ 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. -->'
 
+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,
@@ -65,14 +72,17 @@ 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')
  .replace(/<\?xml version="1.0" encoding="utf-8"\?>/i, '<?xml version="1.0" encoding="utf-8"?>\n' + autoGeneratedWarning)
  .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')
  .replace(/Google Chrome/g, 'Brave')

diff --git 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'))
@@ -84,6 +87,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.