Merge pull request #653 from brave/copy_mac_app_icon

Copy proper app icon to /chrome/app/theme/mac/app.icns

Author: simonhong

lib/config.js

@@ -239,9 +239,12 @@ Config.prototype.update = function (options) {
     this.officialBuild = this.buildConfig === 'Release'
   }
 
-  // In chromium src, empty string represents stable channel.
-  if (options.channel !== 'release')
+  if (this.debugBuild) {
+    this.channel = 'development'
+  } else if (options.channel !== 'release') {
+    // In chromium src, empty string represents stable channel.
     this.channel = options.channel
+  }
 
   if (options.mac_signing_identifier)
     this.mac_signing_identifier = options.mac_signing_identifier

lib/util.js

@@ -93,6 +93,14 @@ const util = {
     fs.copySync(path.join(braveComponentsDir, 'resources', 'default_200_percent', 'brave'), path.join(chromeComponentsDir, 'resources', 'default_200_percent', 'chromium'))
     fs.copySync(path.join(braveAppVectorIconsDir, 'vector_icons', 'brave'), path.join(chromeAppDir, 'vector_icons', 'brave'))
     fs.copySync(path.join(braveResourcesDir, 'settings', 'brave_page_visibility.js'), path.join(chromeResourcesDir, 'settings', 'brave_page_visibility.js'))
+
+    if (process.platform === 'darwin') {
+      // Copy proper mac app icon for channel to chrome/app/theme/mac/app.icns.
+      // Each channel's app icons are stored in brave/app/theme/$channel/app.icns.
+      // With this copying, we don't need to modify chrome/BUILD.gn for this.
+      fs.copySync(path.join(braveAppDir, 'theme', 'brave', 'mac', config.channel, 'app.icns'),
+                  path.join(chromeAppDir, 'theme', 'brave', 'mac', 'app.icns'))
+    }
   },
 
   // Chromium compares pre-installed midl files and generated midl files from IDL during the build to check integrity.