summaryrefslogtreecommitdiffstats
path: root/remoting/branding_Chromium
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 22:12:38 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 22:12:38 +0000
commit6241ac6936f0f7e078524a1e62a62cadbc98f50b (patch)
tree8af20333054a45c7d699add0ff62a5c1506ff179 /remoting/branding_Chromium
parent7b2c5903ba864d1430ef78c4629da14a8700bbc8 (diff)
downloadchromium_src-6241ac6936f0f7e078524a1e62a62cadbc98f50b.zip
chromium_src-6241ac6936f0f7e078524a1e62a62cadbc98f50b.tar.gz
chromium_src-6241ac6936f0f7e078524a1e62a62cadbc98f50b.tar.bz2
[Chromoting] Adding the desktop integration binary to the host installation on Windows.
The desktop integration binary is compiled and added to the host installation only when a multi-process host is built. This CL also renames a few constants to match the multi process host terminology more closely. BUG=134694 Review URL: https://chromiumcodereview.appspot.com/10910075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/branding_Chromium')
-rw-r--r--remoting/branding_Chromium13
1 files changed, 7 insertions, 6 deletions
diff --git a/remoting/branding_Chromium b/remoting/branding_Chromium
index f60a473..524989a 100644
--- a/remoting/branding_Chromium
+++ b/remoting/branding_Chromium
@@ -2,12 +2,13 @@ COMPANY_FULLNAME=The Chromium Authors
PRODUCT_FULLNAME=Chromoting
COPYRIGHT=Copyright (c) 2012 The Chromium Authors. All Rights Reserved.
HOST_PLUGIN_FILE_NAME=Chromoting Host
-HOST_PLUGIN_FILE_DESCRIPTION=Allow another user to access your computer securely over the Internet.
-HOST_FILE_NAME=Chromoting Host
-HOST_FILE_DESCRIPTION=Chromoting Host
-HOST_SERVICE_FILE_NAME=Chromoting Host Service
-HOST_SERVICE_FILE_DESCRIPTION=Chromoting Host Service
-HOST_CONTROLLER_FILE_DESCRIPTION=Chromoting Host Controller
+HOST_PLUGIN_DESCRIPTION=Allow another user to access your computer securely over the Internet.
+HOST_ME2ME_FILE_NAME=Chromoting Host
+HOST_ME2ME_DESCRIPTION=Chromoting Host
+DAEMON_FILE_NAME=Chromoting Host Service
+DAEMON_DESCRIPTION=Chromoting Host Service
+CONTROLLER_DESCRIPTION=Chromoting Host Controller
+DESKTOP_DESCRIPTION=Chromoting Integration Process
MAC_BUNDLE_ID=org.chromium.Chromium
MAC_CREATOR=Cr24
MAC_HOST_BUNDLE_ID=org.chromium.chromoting.remoting_me2me_host