Package It2Me Native Messaging host on Linux.

BUG=309844

Review URL: https://codereview.chromium.org/130133003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246545 0039d316-1c4b-4281-b951-d872f2087c98

remoting/branding_Chrome

@@ -1,10 +1,12 @@
 APK_FILE_NAME=ChromeRemoteDesktop
 DAEMON_FILE_NAME=Chrome Remote Desktop Host Service
 HOST_PLUGIN_FILE_NAME=Chrome Remote Desktop Host
+IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chrome Remote Desktop
 MAC_BUNDLE_ID=com.google.Chrome
 MAC_CREATOR=rimZ
 MAC_HOST_BUNDLE_ID=com.google.chromeremotedesktop.me2me-host
 MAC_PREFPANE_BUNDLE_ID=com.google.chromeremotedesktop.preferences
-MAC_UNINSTALLER_NAME=Chrome Remote Desktop Host Uninstaller
-MAC_UNINSTALLER_BUNDLE_PREFIX=com.google.pkg
 MAC_UNINSTALLER_BUNDLE_ID=com.google.chromeremotedesktop.me2me-host-uninstaller
+MAC_UNINSTALLER_BUNDLE_PREFIX=com.google.pkg
+MAC_UNINSTALLER_NAME=Chrome Remote Desktop Host Uninstaller
+ME2ME_HOST_DESCRIPTION=Chrome Remote Desktop Host

remoting/branding_Chromium

@@ -1,10 +1,12 @@
 APK_FILE_NAME=Chromoting
 DAEMON_FILE_NAME=Chromoting Host Service
 HOST_PLUGIN_FILE_NAME=Chromoting Host
+IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chromoting
 MAC_BUNDLE_ID=org.chromium.Chromium
 MAC_CREATOR=Cr24
 MAC_HOST_BUNDLE_ID=org.chromium.chromoting.me2me-host
 MAC_PREFPANE_BUNDLE_ID=org.chromium.remoting.preferences
-MAC_UNINSTALLER_NAME=Chromoting Host Uninstaller
-MAC_UNINSTALLER_BUNDLE_PREFIX=org.chromium.pkg
 MAC_UNINSTALLER_BUNDLE_ID=org.chromium.chromoting.me2me-host-uninstaller
+MAC_UNINSTALLER_BUNDLE_PREFIX=org.chromium.pkg
+MAC_UNINSTALLER_NAME=Chromoting Host Uninstaller
+ME2ME_HOST_DESCRIPTION=Chromoting Host

remoting/host/installer/linux/Makefile

@@ -10,27 +10,34 @@ TOOLS = $(SRC)/remoting/tools
 RELEASE = $(SRC)/out/Release
 
 INSTALL_DIR = $(DESTDIR)/opt/google/chrome-remote-desktop
-CHROME_MANIFEST_DIR = $(DESTDIR)/etc/opt/chrome/native-messaging-hosts
+NATIVE_MESSAGING_DIR = $(DESTDIR)/etc/opt/chrome/native-messaging-hosts
 
 ME2ME_PROGNAME = $(RELEASE)/remoting_me2me_host
 ME2ME_DEBUGFILE = $(ME2ME_PROGNAME).debug
 START_PROGNAME = $(RELEASE)/remoting_start_host
 START_DEBUGFILE = $(START_PROGNAME).debug
-NM_PROGNAME = $(RELEASE)/remoting_native_messaging_host
-NM_DEBUGFILE = $(NM_PROGNAME).debug
+ME2ME_NM_PROGNAME = $(RELEASE)/remoting_native_messaging_host
+ME2ME_NM_DEBUGFILE = $(ME2ME_NM_PROGNAME).debug
+REMOTE_ASSISTANCE_PROGNAME = $(RELEASE)/remoting_it2me_native_messaging_host
+REMOTE_ASSISTANCE_DEBUGFILE = $(REMOTE_ASSISTANCE_PROGNAME).debug
 
 all:
 
 install:
 	install -d "$(INSTALL_DIR)"
-	install -d "$(CHROME_MANIFEST_DIR)"
+	install -d "$(NATIVE_MESSAGING_DIR)"
 
 	install "$(TOOLS)/me2me_virtual_host.py" \
 	  "$(INSTALL_DIR)/chrome-remote-desktop"
 	install "$(TOOLS)/is-remoting-session" "$(INSTALL_DIR)"
 
-	install "$(RELEASE)/remoting/com.google.chrome.remote_desktop.json" \
-	  -m 0644 "$(CHROME_MANIFEST_DIR)"
+	install -m 0644 \
+	    "$(RELEASE)/remoting/com.google.chrome.remote_desktop.json" \
+	   "$(NATIVE_MESSAGING_DIR)/com.google.chrome.remote_desktop.json"
+
+	install -m 0644 \
+	  "$(RELEASE)/remoting/com.google.chrome.remote_assistance.json" \
+	  "$(NATIVE_MESSAGING_DIR)/com.google.chrome.remote_assistance.json"
 
 	eu-strip -f "$(ME2ME_DEBUGFILE)" "$(ME2ME_PROGNAME)"
 	install "$(ME2ME_PROGNAME)" \
@@ -39,5 +46,15 @@ install:
 	eu-strip -f "$(START_DEBUGFILE)" "$(START_PROGNAME)"
 	install "$(START_PROGNAME)" "$(INSTALL_DIR)/start-host"
 
-	eu-strip -f "$(NM_DEBUGFILE)" "$(NM_PROGNAME)"
-	install "$(NM_PROGNAME)" "$(INSTALL_DIR)/native-messaging-host"
+	eu-strip -f "$(ME2ME_NM_DEBUGFILE)" "$(ME2ME_NM_PROGNAME)"
+	install "$(ME2ME_NM_PROGNAME)" "$(INSTALL_DIR)/native-messaging-host"
+
+	eu-strip -f "$(REMOTE_ASSISTANCE_DEBUGFILE)" \
+	  "$(REMOTE_ASSISTANCE_PROGNAME)"
+	install "$(REMOTE_ASSISTANCE_PROGNAME)" \
+	  "$(INSTALL_DIR)/remote-assistance-host"
+
+	for locale in $(ls $(RELEASE)/remoting_locales); do \
+	  install "$(RELEASE)/remoting_locales/$locale \
+	    "$(INSTALL_DIR)/remoting_locales/$locale; \
+	done

remoting/host/it2me/com.google.chrome.remote_assistance.json.jinja2

@@ -0,0 +1,15 @@
+{
+  "name": "com.google.chrome.remote_assistance",
+  "description": "{{ IT2ME_HOST_DESCRIPTION }}",
+  "type": "stdio",
+  "path": "{{ IT2ME_HOST_PATH }}",
+  "allowed_origins": [
+    "chrome-extension://ljacajndfccfgnfohlgkdphmbnpkjflk/",
+    "chrome-extension://gbchcmhmhahfdphkhkmpfmihenigjmpp/",
+    "chrome-extension://kgngmbheleoaphbjbaiobfdepmghbfah/",
+    "chrome-extension://odkaodonbgfohohmklejpjiejmcipmib/",
+    "chrome-extension://ojoimpklfciegopdfgeenehpalipignm/",
+    "chrome-extension://dokpleeekgeeiehdhmdkeimnkmoifgdd/",
+    "chrome-extension://ajoainacpilcemgiakehflpbkbfipojk/"
+  ]
+}

remoting/host/setup/me2me_native_messaging_manifest.json → remoting/host/setup/com.google.chrome.remote_desktop.json.jinja2

@@ -1,8 +1,8 @@
 {
   "name": "com.google.chrome.remote_desktop",
-  "description": "{% trans %}REMOTING_HOST_PLUGIN_NAME{% endtrans %}",
+  "description": "{{ ME2ME_HOST_DESCRIPTION }}",
   "type": "stdio",
-  "path": "{{ ME2ME_NATIVE_MESSAGING_HOST_PATH }}",
+  "path": "{{ ME2ME_HOST_PATH }}",
   "allowed_origins": [
     "chrome-extension://ljacajndfccfgnfohlgkdphmbnpkjflk/",
     "chrome-extension://gbchcmhmhahfdphkhkmpfmihenigjmpp/",