diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 22:00:46 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 22:00:46 +0000 |
| commit | b41e50ab720ab3fe6fed5922684e29d08b9bc28f (patch) | |
| tree | 497482debdb678fc10ebc73ae7e570eb318bd725 /chrome | |
| parent | 9e042a96dc10e9c2e106b7893bfe284c04dbfa80 (diff) | |
| download | chromium_src-b41e50ab720ab3fe6fed5922684e29d08b9bc28f.zip chromium_src-b41e50ab720ab3fe6fed5922684e29d08b9bc28f.tar.gz chromium_src-b41e50ab720ab3fe6fed5922684e29d08b9bc28f.tar.bz2 | |
Set proper bundle ID based on the state of branding.
Review URL: http://codereview.chromium.org/42036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/app-Info.plist | 6 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist index 180bd4b..9b83981 100644 --- a/chrome/app/app-Info.plist +++ b/chrome/app/app-Info.plist @@ -9,7 +9,7 @@ <key>CFBundleIconFile</key> <string>app.icns</string> <key>CFBundleIdentifier</key> - <string>com.google.${PRODUCT_NAME:identifier}</string> + <string>BUNDLE_ID</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> @@ -18,11 +18,11 @@ <string>????</string> <key>CFBundleVersion</key> <string>0.1</string> + <key>LSUIElement</key> + <string>1</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> <string>NSApplication</string> - <key>LSUIElement</key> - <string>1</string> </dict> </plist> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fed3c9a..f468b0b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1454,10 +1454,21 @@ 'conditions': [ ['branding=="Chrome"', { 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], + # "bundle_id" is the name of the variable used to replace + # BUNDLE_ID in Info.plist. + 'variables': {'bundle_id': 'com.google.Chrome'}, }, { # else: branding!="Chrome" 'mac_bundle_resources': ['app/theme/chromium/app.icns'], + 'variables': {'bundle_id': 'org.chromium.Chromium'}, }], ], + 'xcode_settings': { + # chrome/app/app-Info.plist has a CFBundleIdentifier of BUNDLE_ID, + # to be replaced by a properly branded bundle ID in Xcode with + # these settings. + 'INFOPLIST_PREPROCESS': 'YES', + 'INFOPLIST_PREPROCESSOR_DEFINITIONS': ['BUNDLE_ID="<(bundle_id)"'], + }, }, { # else: OS != "mac" 'conditions': [ ['branding=="Chrome"', { |