Merge 279449 "Use Consolas for Windows 7 and above as default mo..."

chrome/app/resources/locale_settings_win.grd

 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/platform_locale_settings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
     <output filename="platform_locale_settings_am.pak" type="data_package" lang="am" />
     <output filename="platform_locale_settings_ar.pak" type="data_package" lang="ar" />
     <output filename="platform_locale_settings_bg.pak" type="data_package" lang="bg" />
     <output filename="platform_locale_settings_bn.pak" type="data_package" lang="bn" />
@@ skipping 109 matching lines @@
       <!-- The default value for |WebPreference::standard_font_family| -->
       <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
         Times New Roman
       </message>
 
       <!-- The default value for |WebPreference::fixed_font_family| -->
       <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
         Courier New
       </message>
 
+      <!-- Alternate value for |WebPreference::fixed_font_family| -->
+      <message name="IDS_FIXED_FONT_FAMILY_ALT_WIN" use_name_for_id="true">
+        Consolas
+      </message>
+
       <!-- The default value for |WebPreference::serif_font_family| -->
       <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
         Times New Roman
       </message>
 
       <!-- The default value for |WebPreference::sans_serif_font_family| -->
       <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
         Arial
       </message>
 
@@ skipping 177 matching lines @@
         0
       </message>
 
       <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
       <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
         6
       </message>
     </messages>
   </release>
 </grit>