Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 450433002: [Resources] Move roboto.woff and add roboto.woff2 to a roboto/ directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fallback to sans-serif Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/contextual_search/promo.css » ('j') | chrome/browser/resources/contextual_search/promo.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <if expr="is_posix and not is_macosx and not is_ios"> 107 <if expr="is_posix and not is_macosx and not is_ios">
108 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 108 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
109 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 109 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
110 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 110 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
111 </if> 111 </if>
112 <if expr="enable_app_list"> 112 <if expr="enable_app_list">
113 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 113 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
114 </if> 114 </if>
115 <if expr="is_android"> 115 <if expr="is_android">
116 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextua l_search\promo.js" type="BINDATA" /> 116 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextua l_search\promo.js" type="BINDATA" />
117 <include name="IDR_CONTEXTUAL_SEARCH_ROBOTO_WOFF" file="resources\contex tual_search\roboto.woff" type="BINDATA" />
118 </if> 117 </if>
119 <if expr="enable_printing"> 118 <if expr="enable_printing">
120 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 119 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
121 </if> 120 </if>
122 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 121 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
123 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 122 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
124 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" /> 123 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" />
125 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 124 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
126 <if expr="not is_ios"> 125 <if expr="not is_ios">
127 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/> 126 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/>
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" /> 206 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" />
208 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" /> 207 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" />
209 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" /> 208 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" />
210 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" /> 209 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" />
211 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" /> 210 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" />
212 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" /> 211 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" />
213 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" /> 212 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />
214 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" /> 213 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />
215 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" /> 214 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" />
216 215
216 <include name="IDR_ROBOTO_WOFF" file="resources\roboto\roboto.woff" type=" BINDATA" />
217 <include name="IDR_ROBOTO_WOFF2" file="resources\roboto\roboto.woff2" type ="BINDATA" />
217 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 218 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
218 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 219 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
219 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 220 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
220 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/> 221 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/>
221 <if expr="not is_android"> 222 <if expr="not is_android">
222 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 223 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
223 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 224 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
224 </if> 225 </if>
225 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 226 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
226 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" /> 227 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" /> 433 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" />
433 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 434 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
434 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 435 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
435 </if> 436 </if>
436 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 437 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
437 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 438 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
438 </if> 439 </if>
439 </includes> 440 </includes>
440 </release> 441 </release>
441 </grit> 442 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/contextual_search/promo.css » ('j') | chrome/browser/resources/contextual_search/promo.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698