diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 17:08:16 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 17:08:16 +0000 |
| commit | ef525cc4860e4f4868da898d28b1a23b5a695b53 (patch) | |
| tree | 4aea31438c093ef3edafa88fbb5cf66344865e12 /chrome/chrome.gyp | |
| parent | 93fd78f484b75a75ab346d03cb2d8cb6e5ba4037 (diff) | |
| download | chromium_src-ef525cc4860e4f4868da898d28b1a23b5a695b53.zip chromium_src-ef525cc4860e4f4868da898d28b1a23b5a695b53.tar.gz chromium_src-ef525cc4860e4f4868da898d28b1a23b5a695b53.tar.bz2 | |
Add default browser checking and setting on Linux.
BUG=11972
TEST=none
Review URL: http://codereview.chromium.org/155100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 13e7e95..26c37fef 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1434,6 +1434,7 @@ 'browser/shell_integration.cc', 'browser/shell_integration.h', 'browser/shell_integration_mac.mm', + 'browser/shell_integration_linux.cc', 'browser/spellcheck_worditerator.cc', 'browser/spellcheck_worditerator.h', 'browser/spellchecker.cc', @@ -2551,7 +2552,19 @@ 'copies': [ { 'destination': '<(PRODUCT_DIR)', - 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'], + 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak', + 'tools/build/linux/chrome-wrapper', + '../third_party/xdg-utils/scripts/xdg-settings', + ], + # The wrapper script above may need to generate a .desktop file, + # which requires an icon. So, copy one next to the script. + 'conditions': [ + ['branding=="Chrome"', { + 'files': ['app/theme/google_chrome/product_logo_48.png'] + }, { # else: 'branding!="Chrome" + 'files': ['app/theme/chromium/product_logo_48.png'] + }], + ], }, { 'destination': '<(PRODUCT_DIR)/locales', |