Merge 53715 - Remove code to handle bogus themes. We've had a theming system...

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file contains definitions of resources that will be translated for
 each locale. -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/generated_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
@@ skipping 4636 matching lines @@
       </message>
       </if>
       <if expr="not pp_ifdef('chromeos')">
       <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
         <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is up to date (<ph name="VERSION">$2<ex>0.1.131</ex></ph>)
       </message>
       </if>
       <message name="IDS_UPGRADE_ERROR" desc="Status label: Error occurred during upgrade">
         Update server not available (error: <ph name="ERROR_NUMBER">$1<ex>1</ex></ph>)
       </message>
-      <message name="IDS_RESOURCE_ERROR" desc="Error loading resource">
-        An error was encountered while loading a program resource. Try reinstalling.
-      </message>
-      <message name="IDS_RESOURCE_ERROR_CAPTION" desc="Error loading resource caption">
-        Resource Error
-      </message>
 
       <!-- Print -->
       <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
         Untitled Document
       </message>
       <message name="IDS_DEFAULT_PRINTER_NOT_FOUND_WARNING" desc="The message of the warning dialog when no printer is available">
         No printer found. Please install a printer.
       </message>
       <message name="IDS_PRINT_SPOOL_FAILED_ERROR_TEXT" desc="Text in a messagebox when printing fails because of printer issues.">
         Something went wrong when trying to print.  Please check your printer and try again.
@@ skipping 4187 matching lines @@
 
     </messages>
 
     <structures fallback_to_english="true">
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
 
   </release>
 </grit>