| OLD | NEW | 
|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> | 
| 2 <!-- This grd file contains images that are not pre-scaled for device | 2 <!-- This grd file contains images that are not pre-scaled for device | 
| 3      scale factors. The image returned by | 3      scale factors. The image returned by | 
| 4      |base::ResourceBundle::GetImageNamed| only contains 100P, and | 4      |base::ResourceBundle::GetImageNamed| only contains 100P, and | 
| 5      it is the caller's responsibility to do the right thing when the | 5      it is the caller's responsibility to do the right thing when the | 
| 6      display is not at 100P device scale factor. | 6      display is not at 100P device scale factor. | 
| 7   --> | 7   --> | 
| 8 <grit latest_public_release="0" current_release="1"> | 8 <grit latest_public_release="0" current_release="1"> | 
| 9   <outputs> | 9   <outputs> | 
| 10     <output filename="grit/chrome_unscaled_resources.h" type="rc_header"> | 10     <output filename="grit/chrome_unscaled_resources.h" type="rc_header"> | 
| 11       <emit emit_type='prepend'></emit> | 11       <emit emit_type='prepend'></emit> | 
| 12     </output> | 12     </output> | 
| 13     <output filename="chrome_unscaled_resources.pak" type="data_package" /> | 13     <output filename="chrome_unscaled_resources.pak" type="data_package" /> | 
| 14   </outputs> | 14   </outputs> | 
| 15   <release seq="1"> | 15   <release seq="1"> | 
| 16     <includes> | 16     <includes> | 
| 17       <if expr="_google_chrome"> | 17       <if expr="_google_chrome"> | 
| 18         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.
     png" type="BINDATA" /> | 18         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.
     png" type="BINDATA" /> | 
| 19         <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_12
     8.png" type="BINDATA" /> | 19         <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_12
     8.png" type="BINDATA" /> | 
| 20         <!-- NOTE: product_logo_*.* files beyond what's listed above are | 20         <!-- NOTE: product_logo_*.* files beyond what's listed above are | 
| 21              referenced by installer code; don't remove them unless you know | 21              referenced by installer code; don't remove them unless you know | 
| 22              what you're doing! --> | 22              what you're doing! --> | 
| 23         <if expr="is_macosx"> | 23         <if expr="is_macosx"> | 
| 24           <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_
     22_mono.png" type="BINDATA" /> | 24           <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_
     22_mono.png" type="BINDATA" /> | 
| 25         </if> | 25         </if> | 
| 26         <if expr="not is_macosx"> | 26         <if expr="not is_macosx and not is_win"> | 
| 27           <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_
     22.png" type="BINDATA" /> | 27           <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_
     22.png" type="BINDATA" /> | 
| 28         </if> | 28         </if> | 
| 29       </if> | 29       </if> | 
| 30       <if expr="not _google_chrome"> | 30       <if expr="not _google_chrome"> | 
| 31         <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" 
     type="BINDATA" /> | 31         <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" 
     type="BINDATA" /> | 
| 32         <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png
     " type="BINDATA" /> | 32         <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png
     " type="BINDATA" /> | 
| 33         <!-- NOTE: product_logo_*.* files beyond what's listed above are | 33         <!-- NOTE: product_logo_*.* files beyond what's listed above are | 
| 34              referenced by installer code; don't remove them unless you know | 34              referenced by installer code; don't remove them unless you know | 
| 35              what you're doing! --> | 35              what you're doing! --> | 
| 36         <if expr="is_macosx"> | 36         <if expr="is_macosx"> | 
| 37           <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mo
     no.png" type="BINDATA" /> | 37           <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22_mo
     no.png" type="BINDATA" /> | 
| 38         </if> | 38         </if> | 
| 39         <if expr="not is_macosx"> | 39         <if expr="not is_macosx and not is_win"> | 
| 40           <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn
     g" type="BINDATA" /> | 40           <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn
     g" type="BINDATA" /> | 
| 41         </if> | 41         </if> | 
| 42       </if> | 42       </if> | 
| 43       <if expr="is_win"> | 43       <if expr="is_win"> | 
| 44         <!-- Double-size profile avatar images used for generating .ico | 44         <!-- Double-size profile avatar images used for generating .ico | 
| 45              files for Windows profile shortcuts. Included here because | 45              files for Windows profile shortcuts. Included here because | 
| 46              they do not depend on the UI scale factor. | 46              they do not depend on the UI scale factor. | 
| 47              See: http://crbug.com/167277. --> | 47              See: http://crbug.com/167277. --> | 
| 48         <include name="IDR_PROFILE_AVATAR_2X_0" file="default_200_percent/common
     /profile_avatar_generic.png" type="BINDATA" /> | 48         <include name="IDR_PROFILE_AVATAR_2X_0" file="default_200_percent/common
     /profile_avatar_generic.png" type="BINDATA" /> | 
| 49         <include name="IDR_PROFILE_AVATAR_2X_1" file="default_200_percent/common
     /profile_avatar_generic_aqua.png" type="BINDATA" /> | 49         <include name="IDR_PROFILE_AVATAR_2X_1" file="default_200_percent/common
     /profile_avatar_generic_aqua.png" type="BINDATA" /> | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119             http://crbug.com/409047 --> | 119             http://crbug.com/409047 --> | 
| 120         <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT
     A" /> | 120         <include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDAT
     A" /> | 
| 121         <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND
     ATA" /> | 121         <include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BIND
     ATA" /> | 
| 122         <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type="
     BINDATA" /> | 122         <include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type="
     BINDATA" /> | 
| 123         <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI
     NDATA" /> | 123         <include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BI
     NDATA" /> | 
| 124         <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT
     A" /> | 124         <include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDAT
     A" /> | 
| 125       </if> | 125       </if> | 
| 126     </includes> | 126     </includes> | 
| 127   </release> | 127   </release> | 
| 128 </grit> | 128 </grit> | 
| OLD | NEW | 
|---|