Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6793)

Unified Diff: chrome/chrome.gyp

Issue 155100: Add default browser checking and setting on Linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/shell_integration_linux.cc ('k') | chrome/common/temp_scaffolding_stubs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 20329)
+++ chrome/chrome.gyp (working copy)
@@ -1432,6 +1432,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',
@@ -2549,7 +2550,17 @@
'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',
+ ],
+ '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',
« no previous file with comments | « chrome/browser/shell_integration_linux.cc ('k') | chrome/common/temp_scaffolding_stubs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698