Adding a secondary mini_installer target for Chrome Frame. This will remove t...

chrome/chrome_exe.gypi

 # Copyright (c) 2009 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.
 
 {
   'target_defaults': {
     'variables': {
       'chrome_exe_target': 0,
     },
     'target_conditions': [
@@ skipping 112 matching lines @@
   'targets': [
     {
       'target_name': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
       'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
       'variables': {
         'chrome_exe_target': 1,
       },
       'conditions': [
-        ['chrome_frame_define==1 and OS=="win"', {
-          # TODO(gregoryd): This could be shared with the 64-bit target, but
-          # it does not work due to a gyp issue.
-          'dependencies': [
-            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
-          ],
-        }],
         ['OS=="linux" or OS=="freebsd"', {
           'actions': [
             {
               'action_name': 'manpage',
               'conditions': [
                 [ 'branding == "Chrome"', {
                   'variables': {
                     'name': 'Google Chrome',
                     'filename': 'google-chrome',
                     'confdir': 'google-chrome',
@@ skipping 352 matching lines @@
           'dependencies': [
             # On Windows make sure we've built Win64 version of chrome_dll,
             # which contains all of the library code with Chromium
             # functionality.
             'chrome_dll_nacl_win64',
             'installer/installer.gyp:installer_util_nacl_win64',
             'common_constants_win64',
             '../breakpad/breakpad.gyp:breakpad_handler_win64',
             '../breakpad/breakpad.gyp:breakpad_sender_win64',
             '../base/base.gyp:base_nacl_win64',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             # TODO(gregoryd): build sandbox for 64 bit
             # '../sandbox/sandbox.gyp:sandbox',
           ],
           'defines': [
             '<@(nacl_win64_defines)',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'ImportLibrary': '$(OutDir)\\lib\\nacl_exe.lib',
               'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb',
             },
           },
-          'conditions': [
-            ['chrome_frame_define==1 and OS=="win"', {
-              # TODO(gregoryd): This could be shared with the 32-bit target, but
-              # it does not work due to a gyp issue.
-              'dependencies': [
-                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
-              ],
-            }],
-          ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }