diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 19:17:16 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 19:17:16 +0000 |
| commit | 5fd3aa4f25bb6c56dcd3069e98cf8f97c709bead (patch) | |
| tree | 5860ca6518c87dbdb8614a0bcec35cd10cd5b439 /chrome | |
| parent | 3a872d5919ac4dc340ba12594e8a6b6dce6a7d88 (diff) | |
| download | chromium_src-5fd3aa4f25bb6c56dcd3069e98cf8f97c709bead.zip chromium_src-5fd3aa4f25bb6c56dcd3069e98cf8f97c709bead.tar.gz chromium_src-5fd3aa4f25bb6c56dcd3069e98cf8f97c709bead.tar.bz2 | |
Use common name for icns file to avoid case sensitivity issues with
the filesystem and avoid the need for processing of Info.plist.
Dup of svn log since rietveld doesn't like A+D:
A + chrome/app/theme/chromium/app.icns
D chrome/app/theme/chromium/chromium.icns
M chrome/app/app-Info.plist
M chrome/chrome.gyp
Review URL: http://codereview.chromium.org/40238
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/app-Info.plist | 2 | ||||
| -rw-r--r-- | chrome/app/theme/chromium/app.icns (renamed from chrome/app/theme/chromium/chromium.icns) | bin | 199039 -> 199039 bytes | |||
| -rw-r--r-- | chrome/chrome.gyp | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist index f4a6236..180bd4b 100644 --- a/chrome/app/app-Info.plist +++ b/chrome/app/app-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIconFile</key> - <string>${PRODUCT_NAME:identifier}</string> + <string>app.icns</string> <key>CFBundleIdentifier</key> <string>com.google.${PRODUCT_NAME:identifier}</string> <key>CFBundleInfoDictionaryVersion</key> diff --git a/chrome/app/theme/chromium/chromium.icns b/chrome/app/theme/chromium/app.icns Binary files differindex 4b93e5c..4b93e5c 100644 --- a/chrome/app/theme/chromium/chromium.icns +++ b/chrome/app/theme/chromium/app.icns diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4f04204..d36f093 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1349,9 +1349,9 @@ 'product_name': '<(branding)', 'conditions': [ ['branding=="Chrome"', { - 'mac_bundle_resources': ['app/theme/google_chrome/chrome.icns'], + 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], }, { # else: branding!="Chrome" - 'mac_bundle_resources': ['app/theme/chromium/chromium.icns'], + 'mac_bundle_resources': ['app/theme/chromium/app.icns'], }], ], }], |