Rename official builds to "Google Chrome" on disk and "Chrome" in the menubar...

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 1936 matching lines @@
             },
             {
               'destination': '<(PRODUCT_DIR)/themes',
               'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
             },
           ],
         }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
-          # NOTE: chrome/app/theme/chromium/BRANDING and
-          # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
-          # should we try to extract from there instead?
-          'product_name': '<(branding)',
           'conditions': [
             ['branding=="Chrome"', {
               'mac_bundle_resources': ['app/theme/google_chrome/app.icns'],
               'variables': {
                 'bundle_id': 'com.google.Chrome',
               },
             }, {  # else: 'branding!="Chrome"
               'mac_bundle_resources': ['app/theme/chromium/app.icns'],
               'variables': {
                 'bundle_id': 'org.chromium.Chromium',
               },
             }],
             ['mac_breakpad==1', {
               # Only include breakpad in official builds.
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad',
                 '../breakpad/breakpad.gyp:dump_syms',
                 '../breakpad/breakpad.gyp:symupload',
               ],
               'copies': [
                 {
-                  'destination': '<(PRODUCT_DIR)/<(branding).app/Contents/Resources/',
+                  'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Resources/',
                   'files': ['<(PRODUCT_DIR)/crash_inspector', '<(PRODUCT_DIR)/crash_report_sender.app'],
                 },
               ],
               'target_conditions': [
                 # We use target_conditions here that is always true to force
                 # this post build to run last.  This lets the strip from
                 # common.gypi go ahead of it, so we can always hit the
                 # upstripped app within the fake dSYM.
                 ['1', {
                   'postbuilds': [
                     {
                       'postbuild_name': 'Dump Symbols',
                       'action': ['<(DEPTH)/build/mac/dump_app_syms',
                                  '<(branding)'],
                     },
                   ],
                 }],
               ],
             }], # mac_breakpad
           ],
+          'product_name': '<(mac_product_name)',
           'xcode_settings': {
-            # chrome/app/app-Info.plist has a CFBundleIdentifier of
-            # CHROMIUM_BUNDLE_ID to be replaced by a branded bundle ID in Xcode
-            # with this settings.
+            # chrome/app/app-Info.plist has:
+            #   CFBundleIdentifier of CHROMIUM_BUNDLE_ID
+            #   CFBundleName of CHROMIUM_SHORT_NAME
+            # Xcode then replaces these values with the branded values we set
+            # as settings on the target.
             'CHROMIUM_BUNDLE_ID': '<(bundle_id)',
+            'CHROMIUM_SHORT_NAME': '<(branding)',
           },
         }, { # else: OS != "mac"
           'conditions': [
             ['branding=="Chrome"', {
               'product_name': 'chrome'
             }, {  # else: Branding!="Chrome"
               # TODO:  change to:
               #   'product_name': 'chromium'
               # whenever we convert the rest of the infrastructure
               # (buildbots etc.) to use "gyp -Dbranding=Chrome".
@@ skipping 962 matching lines @@
         }],
         ['OS!="win"', {
           'sources!': [
             'test/perf/mem_usage.cc',
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    # We set a few feature variables so the different parts that need to check
-    # for the mac build, check that flag instead of coding it based on branding.
+    # We set a feature variable so the different parts that need to check for
+    # the mac build use of breakpad, check that flag instead of coding it based
+    # on branding.
+    # We need the Mac app name on disk, so we stick this into a variable so
+    # the different places that need it can use the common variable.
+    # NOTE: chrome/app/theme/chromium/BRANDING and
+    # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
+    # but extracting from there still means xcodeproject are out of date until
+    # the next project regeneration.
     ['OS=="mac" and branding=="Chrome"', {
       'variables': {
-        'mac_breakpad%': 1
+        'mac_breakpad%': 1,
+        'mac_product_name%': 'Google Chrome',
       }
     }, {
       'variables': {
-        'mac_breakpad%': 0
+        'mac_breakpad%': 0,
+        'mac_product_name%': 'Chromium',
       }
     }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'convert_dict',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'third_party/hunspell/hunspell.gyp:hunspell',
@@ skipping 522 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }