Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/prebuild/create_string_rc.py

 #!/usr/bin/env python
 # 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.
 
 """This script generates an rc file and header (setup_strings.{rc,h}) to be
 included in setup.exe. The rc file includes translations for strings pulled
 from generated_resource.grd and the localized .xtb files.
 
 The header file includes IDs for each string, but also has values to allow
@@ skipping 34 matching lines @@
   'IDS_PRODUCT_NAME',
   'IDS_SXS_SHORTCUT_NAME',
   'IDS_PRODUCT_APP_LAUNCHER_NAME',
   'IDS_PRODUCT_BINARIES_NAME',
   'IDS_PRODUCT_DESCRIPTION',
   'IDS_PRODUCT_FRAME_NAME',
   'IDS_UNINSTALL_CHROME',
   'IDS_ABOUT_VERSION_COMPANY_NAME',
   'IDS_INSTALL_HIGHER_VERSION',
   'IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER',
-  'IDS_INSTALL_HIGHER_VERSION_CF',
-  'IDS_INSTALL_HIGHER_VERSION_CB_CF',
   'IDS_INSTALL_SYSTEM_LEVEL_EXISTS',
   'IDS_INSTALL_FAILED',
   'IDS_SAME_VERSION_REPAIR_FAILED',
-  'IDS_SAME_VERSION_REPAIR_FAILED_CF',
   'IDS_SETUP_PATCH_FAILED',
   'IDS_INSTALL_OS_NOT_SUPPORTED',
   'IDS_INSTALL_OS_ERROR',
   'IDS_INSTALL_TEMP_DIR_FAILED',
   'IDS_INSTALL_UNCOMPRESSION_FAILED',
   'IDS_INSTALL_INVALID_ARCHIVE',
   'IDS_INSTALL_INSUFFICIENT_RIGHTS',
   'IDS_INSTALL_NO_PRODUCTS_TO_UPDATE',
   'IDS_UNINSTALL_COMPLETE',
   'IDS_INSTALL_DIR_IN_USE',
@@ skipping 177 matching lines @@
     branding = argv[2]
   translated_strings = CollectTranslatedStrings(branding)
   kFilebase = os.path.join(argv[1], 'installer_util_strings')
   WriteRCFile(translated_strings, kFilebase)
   WriteHeaderFile(translated_strings, kFilebase + '.h')
   return 0
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))