7 files changed, 21 insertions, 105 deletions
diff --git a/remoting/host/host_service.rc b/remoting/host/host_service.rc
index 983c069..e173708 100644
--- a/remoting/host/host_service.rc
+++ b/remoting/host/host_service.rc
@@ -49,51 +49,13 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Chromoting Host Service"
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "InternalName", "remoting_host_service"
-            VALUE "LegalCopyright", "Copyright (C) 2012 The Chromium Authors. All rights reserved."
-            VALUE "OriginalFilename", "remoting_host_service.exe"
-            VALUE "ProductName", "Chromoting Host Service"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // String Table
 //
 
 STRINGTABLE
 BEGIN
-    IDS_DISPLAY_SERVICE_NAME "Chromoting Host Service"
-    IDS_SERVICE_DESCRIPTION "This service enables incoming Chromoting connections."
+    IDS_DISPLAY_SERVICE_NAME "Chrome Remote Desktop Service"
+    IDS_SERVICE_DESCRIPTION "This service enables incoming connections from Chrome Remote Desktop clients."
 END
 
 #endif    // English (U.S.) resources
diff --git a/remoting/host/host_service.ver b/remoting/host/host_service.ver
new file mode 100644
index 0000000..bc502ef
--- /dev/null
+++ b/remoting/host/host_service.ver
@@ -0,0 +1,4 @@
+BINARY=BINARY_SERVICE
+FILE_TYPE=VFT_APP
+INTERNAL_NAME=remoting_service.exe
+ORIGINAL_FILENAME=remoting_service.exe
diff --git a/remoting/host/plugin/constants.h b/remoting/host/plugin/constants.h
index 3316406..c3b9f33 100644
--- a/remoting/host/plugin/constants.h
+++ b/remoting/host/plugin/constants.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,11 @@
 #define REMOTING_HOST_PLUGIN_CONSTANTS_H_
 
 // Warning: If you modify any macro in this file, make sure to modify
-// remoting/remoting.gyp too.
+// the following files too:
+//   - remoting/remoting.gyp
+//   - remoting/chromium_branding
+//   - remoting/google_chrome_branding
+//   - remoting/host/plugin/host_plugin.ver
 
 #define HOST_PLUGIN_DESCRIPTION \
     "Allow another user to access your computer securely over the Internet."
diff --git a/remoting/host/plugin/host_plugin.rc b/remoting/host/plugin/host_plugin.rc
index 5ef6187..612e051 100644
--- a/remoting/host/plugin/host_plugin.rc
+++ b/remoting/host/plugin/host_plugin.rc
@@ -40,11 +40,6 @@ BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE
-BEGIN
-    "\r#include ""remoting/host/plugin/host_plugin_version.rc""\0"
-END
-
 #endif    // APSTUDIO_INVOKED
 
 
@@ -105,16 +100,3 @@ END
 
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "remoting/host/plugin/host_plugin_version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/remoting/host/plugin/host_plugin.ver b/remoting/host/plugin/host_plugin.ver
new file mode 100644
index 0000000..0416488
--- /dev/null
+++ b/remoting/host/plugin/host_plugin.ver
@@ -0,0 +1,5 @@
+BINARY=BINARY_HOST_PLUGIN
+FILE_TYPE=VFT_DLL
+HOST_PLUGIN_MIME_TYPE=application/vnd.chromium.remoting-host
+INTERNAL_NAME=remoting_host_plugin.dll
+ORIGINAL_FILENAME=remoting_host_plugin.dll
diff --git a/remoting/host/plugin/host_plugin_version.rc b/remoting/host/plugin/host_plugin_version.rc
deleted file mode 100644
index 8825599..0000000
--- a/remoting/host/plugin/host_plugin_version.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// The host plugin pulls in strings from remoting.gyp via the pre-processor.
-// The version resource is separate from the auto-generated resources so that
-// Visual Studio will not modify it when the resources are edited in the IDE.
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", HOST_PLUGIN_DESCRIPTION
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "InternalName", "remoting_host_plugin.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2011 The Chromium Authors. All rights reserved."
-            VALUE "MIMEType", HOST_PLUGIN_MIME_TYPE
-            VALUE "OriginalFilename", "remoting_host_plugin.dll"
-            VALUE "ProductName", HOST_PLUGIN_NAME
-            VALUE "ProductVersion", "1, 0, 0, 1"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/remoting/host/remoting_me2me_host.ver b/remoting/host/remoting_me2me_host.ver
new file mode 100644
index 0000000..efc0e05
--- /dev/null
+++ b/remoting/host/remoting_me2me_host.ver
@@ -0,0 +1,4 @@
+BINARY=BINARY_ME2ME_HOST
+FILE_TYPE=VFT_APP
+INTERNAL_NAME=remoting_me2me_host.exe
+ORIGINAL_FILENAME=remoting_me2me_host.exe