[Chromoting] Add brand and version to Chromoting Host Uninstaller builds.

Review URL: https://chromiumcodereview.appspot.com/10180006

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

remoting/host/installer/mac/uninstaller/remoting_uninstaller-Info.plist

@@ -9,23 +9,23 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>BUNDLE_ID</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>BUNDLE_NAME</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.6</string>
+	<string>VERSION_SHORT</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>VERSION_FULL</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2012 The Chromium Authors. All rights reserved.</string>
+	<string>Copyright © 2012 COPYRIGHT_BY All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>remoting_uninstaller</string>
 	<key>NSPrincipalClass</key>

remoting/remoting.gyp

@@ -22,6 +22,9 @@
     'version_full':
       '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@.@PATCH@")',
+    'version_short':
+      '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
+      '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")',
 
     'conditions': [
       ['OS=="mac"', {
@@ -234,6 +237,21 @@
           'target_name': 'remoting_host_uninstaller',
           'type': 'executable',
           'mac_bundle': 1,
+          'conditions': [
+            ['branding == "Chrome"', {
+              'variables': {
+                'copyright_by': 'Google Inc.',
+                'bundle_id': 'com.google.chromeremotedesktop.host_uninstaller',
+                'bundle_name': 'Chrome Remote Desktop Host Uninstaller',
+              },
+            }, { # else branding!="Chrome"
+              'variables': {
+                'copyright_by': 'The Chromium Authors.',
+                'bundle_id': 'org.chromium.remoting.host_uninstaller',
+                'bundle_name': 'Chromoting Host Uninstaller',
+              },
+            }],
+          ],
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
           ],
@@ -241,8 +259,9 @@
             'host/installer/mac/uninstaller/remoting_uninstaller_delegate.mm',
           ],
           'xcode_settings': {
-            'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
             'INFOPLIST_FILE': 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
+            'INFOPLIST_PREPROCESS': 'YES',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_BY="<(copyright_by)"',
           },
           'mac_bundle_resources': [
             'host/installer/mac/uninstaller/remoting_uninstaller.xib',