Merge pull request #395 from brave/overwrite_chromium_image_resources

Overwrite chrome/app/theme/chromium resources with ours

Author: bbondy

build/commands/lib/updatePatches.js

@@ -16,7 +16,7 @@ const updatePatches = (options) => {
   let modifiedDiff = util.run('git', modifiedDiffArgs, runOptions)
   let moddedFileList = modifiedDiff.stdout.toString()
     .split('\n')
-    .filter(s => s.length > 0 && !s.endsWith('.xtb'))
+    .filter(s => s.length > 0 && !s.endsWith('.xtb') && !s.endsWith('.png'))
 
   let n = moddedFileList.length
 

build/commands/lib/util.js

@@ -64,6 +64,9 @@ const util = {
     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'))
     fs.copySync(path.join(braveAppDir, 'theme', 'default_200_percent', 'brave'), path.join(chromeAppDir, 'theme', 'default_200_percent', 'brave'))
+    // By overwriting, we don't need to modify some grd files.
+    fs.copySync(path.join(braveAppDir, 'theme', 'default_100_percent', 'brave'), path.join(chromeAppDir, 'theme', 'default_100_percent', 'chromium'))
+    fs.copySync(path.join(braveAppDir, 'theme', 'default_200_percent', 'brave'), path.join(chromeAppDir, 'theme', 'default_200_percent', 'chromium'))
     fs.copySync(path.join(braveAppDir, 'vector_icons', 'brave'), path.join(chromeAppDir, 'vector_icons', 'brave'))
     // Copy XTB files for app/brave_strings.grd => chromium_strings.grd
     fs.copySync(path.join(braveAppDir, 'resources'), path.join(chromeAppDir, 'resources'))