summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 19:07:09 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 19:07:09 +0000
commit274eeb834395e7481a4c3d2d85378647f2975205 (patch)
tree3d5df621c12ce1c456ec97e1a4e98183f6d7baa6
parent178cbcad76bc850b4abcfc683764e18a1f83e2b8 (diff)
downloadchromium_src-274eeb834395e7481a4c3d2d85378647f2975205.zip
chromium_src-274eeb834395e7481a4c3d2d85378647f2975205.tar.gz
chromium_src-274eeb834395e7481a4c3d2d85378647f2975205.tar.bz2
Give a document icon to Chromium for file types it can view when preview is turned off.
BUG=19763 TEST=per bug. This might not appear to work given how LaunchServices caches and registers applications. You may need to test on a totally clean machine. Review URL: http://codereview.chromium.org/194116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26248 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/app-Info.plist12
-rw-r--r--chrome/app/theme/chromium/document.icnsbin0 -> 92645 bytes
-rw-r--r--chrome/chrome.gyp10
3 files changed, 20 insertions, 2 deletions
diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist
index 8148422..7ca9989 100644
--- a/chrome/app/app-Info.plist
+++ b/chrome/app/app-Info.plist
@@ -13,6 +13,8 @@
<array>
<string>gif</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>image/gif</string>
@@ -32,6 +34,8 @@
<string>html</string>
<string>htm</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>text/html</string>
@@ -50,6 +54,8 @@
<array>
<string>js</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/x-javascript</string>
@@ -65,6 +71,8 @@
<string>jpg</string>
<string>jpeg</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>image/jpeg</string>
@@ -84,6 +92,8 @@
<string>txt</string>
<string>text</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>text/plain</string>
@@ -102,6 +112,8 @@
<array>
<string>png</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>document.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>image/png</string>
diff --git a/chrome/app/theme/chromium/document.icns b/chrome/app/theme/chromium/document.icns
new file mode 100644
index 0000000..94adce1
--- /dev/null
+++ b/chrome/app/theme/chromium/document.icns
Binary files differ
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index bdf8863..f84f6a2 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3201,7 +3201,10 @@
# (e.g. "Chromium", "Chrome")
'conditions': [
['branding=="Chrome"', {
- 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'],
+ 'mac_bundle_resources': [
+ 'app/theme/google_chrome/app.icns',
+ 'app/theme/google_chrome/document.icns',
+ ],
'copies': [
{
'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',
@@ -3213,7 +3216,10 @@
},
],
}, { # else: 'branding!="Chrome"
- 'mac_bundle_resources': ['app/theme/chromium/app.icns'],
+ 'mac_bundle_resources': [
+ 'app/theme/chromium/app.icns',
+ 'app/theme/chromium/document.icns',
+ ],
'copies': [
{
'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',