Correcting dependency problem that causes setup.exe to get built before chrom...

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
     ['OS=="win"', {
       'targets': [
@@ skipping 315 matching lines @@
                 '<(scan_server_dlls_py)',
                 '--output_dir=<(PRODUCT_DIR)',
                 '--input_file=<(RULE_INPUT_PATH)',
                 '--header_output_dir=<(INTERMEDIATE_DIR)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
               ],
             },
           ],
-          # TODO(mark):  <(branding_dir) should be defined by the
-          # global condition block at the bottom of the file, but
-          # this doesn't work due to the following issue:
-          #
-          #   http://code.google.com/p/gyp/issues/detail?id=22
-          #
-          # Remove this block once the above issue is fixed.
           'conditions': [
+            ['chrome_frame_define==1', {
+              'dependencies': [
+                '../../chrome_frame/chrome_frame.gyp:npchrome_tab',
+              ],
+            }],
+            # TODO(mark):  <(branding_dir) should be defined by the
+            # global condition block at the bottom of the file, but
+            # this doesn't work due to the following issue:
+            #
+            #   http://code.google.com/p/gyp/issues/detail?id=22
+            #
+            # Remove this block once the above issue is fixed.
             [ 'branding == "Chrome"', {
               'variables': {
                  'branding_dir': '../app/theme/google_chrome',
               },
             }, { # else branding!="Chrome"
               'variables': {
                  'branding_dir': '../app/theme/chromium',
               },
             }],
           ],
@@ skipping 270 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: