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

BUG=11826
Review URL: http://codereview.chromium.org/115474

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16313 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 24 insertions, 15 deletions

diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist
index 8c18310..4c8c2a1 100644
--- a/chrome/app/app-Info.plist
+++ b/chrome/app/app-Info.plist
@@ -123,7 +123,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>${CHROMIUM_SHORT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 886f642..fcc77cd 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1958,10 +1958,6 @@
         ['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'],
@@ -1983,7 +1979,7 @@
               ],
               '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'],
                 },
               ],
@@ -2004,11 +2000,15 @@
               ],
             }], # 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': [
@@ -2992,15 +2992,24 @@
     },
   ],
   '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"', {
diff --git a/chrome/common/mac_app_names.h b/chrome/common/mac_app_names.h
index 645fdca..ab70987 100644
--- a/chrome/common/mac_app_names.h
+++ b/chrome/common/mac_app_names.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_MAC_APP_NAMES_H_
 
 #if defined(GOOGLE_CHROME_BUILD)
-#define MAC_BROWSER_APP_NAME "Chrome.app"
+#define MAC_BROWSER_APP_NAME "Google Chrome.app"
 #elif defined(CHROMIUM_BUILD)
 #define MAC_BROWSER_APP_NAME "Chromium.app"
 #else
diff --git a/chrome/tools/build/mac/FILES-official b/chrome/tools/build/mac/FILES-official
index f57db07..fd80032 100644
--- a/chrome/tools/build/mac/FILES-official
+++ b/chrome/tools/build/mac/FILES-official
@@ -1 +1 @@
-Chrome.app
+Google Chrome.app