summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 01:29:04 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 01:29:04 +0000
commitcdeb0a609ebdef1718708d821f5169ea21eb3ca0 (patch)
treee7e36d0db2e47758b20be97eaa848f8e08c75c3b /chrome/tools
parent3bca8d06ea7ed8ff38b6a5e014bb4f1a6df61b73 (diff)
downloadchromium_src-cdeb0a609ebdef1718708d821f5169ea21eb3ca0.zip
chromium_src-cdeb0a609ebdef1718708d821f5169ea21eb3ca0.tar.gz
chromium_src-cdeb0a609ebdef1718708d821f5169ea21eb3ca0.tar.bz2
Linux: allow the desktop file name to be given in an environment variable for development Chromium builds, to avoid conflicting with packaged Chromium.
BUG=none TEST=none Review URL: http://codereview.chromium.org/159108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-xchrome/tools/build/linux/chrome-wrapper3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/tools/build/linux/chrome-wrapper b/chrome/tools/build/linux/chrome-wrapper
index 7792e9b..72a3e3e 100755
--- a/chrome/tools/build/linux/chrome-wrapper
+++ b/chrome/tools/build/linux/chrome-wrapper
@@ -7,7 +7,7 @@
# Running Chromium via this script makes it possible to set Chromium as the
# default browser directly out of a compile, without needing to package it.
-DESKTOP="chromium-browser"
+DESKTOP="chromium-devel"
TITLE="Chromium"
# Check to see if there is a desktop file of the given name
@@ -44,6 +44,7 @@ EOF
# Let the wrapped binary know that it has been run through the wrapper
export CHROME_WRAPPER="`readlink -f "$0"`"
+export CHROME_DESKTOP="$DESKTOP.desktop"
HERE="`dirname "$CHROME_WRAPPER"`"