Enable pairing registry in me2me native messaging host on Windows

remoting/remoting_host.gypi

 # 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.
 
 {
   'includes': [
     'remoting_host_linux.gypi',
     'remoting_host_mac.gypi',
     'remoting_host_win.gypi',
   ],
@@ skipping 537 matching lines @@
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/it2me/it2me_host.cc',
             'host/it2me/it2me_host.h',
             'host/it2me/it2me_native_messaging_host.cc',
             'host/it2me/it2me_native_messaging_host.h',
           ],
         },  # end of target 'remoting_it2me_host_static'
         {
+          'target_name': 'remoting_me2me_native_messaging_host',
+          'type': 'executable',
+          'product_name': 'remoting_native_messaging_host',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            'remoting_host',
+            'remoting_host_setup_base',
+            'remoting_native_messaging_base',
+          ],
+          'sources': [
+            'host/setup/me2me_native_messaging_host_main.cc',
+          ],
+          'conditions': [
+            ['OS=="linux" and linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        },  # end of target 'remoting_me2me_native_messaging_host'
+        {
           'target_name': 'remoting_it2me_native_messaging_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_it2me_host_static',
             'remoting_native_messaging_base',
@@ skipping 33 matching lines @@
           ],
         },  # end of target 'remoting_it2me_native_messaging_host'
 
         # Generates native messaging manifest files.
         {
           'target_name': 'remoting_native_messaging_manifests',
           'type': 'none',
           'conditions': [
             [ 'OS == "win"', {
               'variables': {
-                'me2me_host_path': 'remoting_host.exe',
+                'me2me_host_path': 'remoting_native_messaging_host.exe',
                 'it2me_host_path': 'remoting_assistance_host.exe',
               },
             }],
             [ 'OS == "mac"', {
               'variables': {
                 'me2me_host_path':
                     '/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host',
                 'it2me_host_path':
                     '/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/remote_assistance_host',
               },
             }],
             [ 'OS != "mac" and OS != "win"', {
               'variables': {
                 'me2me_host_path':
                     '/opt/google/chrome-remote-desktop/native-messaging-host',
                 'it2me_host_path':
                     '/opt/google/chrome-remote-desktop/remote-assistance-host',
               },
             }],
           ],  # conditions
           'sources': [
+            'host/setup/com.google.chrome.remote_desktop.json.jinja2',

[Sergey Ulanov, 2014/02/13 01:53:24]

I believe the previous order was correct.

[weitao, 2014/02/13 18:13:09]

Done.

             'host/it2me/com.google.chrome.remote_assistance.json.jinja2',
-            'host/setup/com.google.chrome.remote_desktop.json.jinja2',
           ],
           'rules': [{
             'rule_name': 'generate_manifest',
             'extension': 'jinja2',
             'inputs': [
               '<(remoting_localize_path)',
               '<(branding_path)',
               '<(RULE_INPUT_PATH)',
             ],
             'outputs': [
@@ skipping 135 matching lines @@
                 }],  # mac_breakpad==1
               ],  # conditions
             }],  # OS=mac
             ['OS=="linux" and linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],  # OS=linux
           ],  # end of 'conditions'
         },  # end of target 'remoting_me2me_host'
-        {
-          'target_name': 'remoting_me2me_native_messaging_host',
-          'type': 'executable',
-          'product_name': 'remoting_native_messaging_host',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base',
-            'remoting_host',
-            'remoting_host_setup_base',
-            'remoting_native_messaging_base',
-          ],
-          'sources': [
-            'host/setup/me2me_native_messaging_host_main.cc',
-          ],
-          'conditions': [
-            ['OS=="linux" and linux_use_tcmalloc==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        },  # end of target 'remoting_me2me_native_messaging_host'
       ],  # end of 'targets'
     }],  # OS!="win"
 
   ],  # end of 'conditions'
 }