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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 112673008: Revert 242262 "Revert of https://codereview.chromium.org/119913003/" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 | trunk/src/chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
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 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" /> 193 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />
194 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" /> 194 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />
195 195
196 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 196 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
197 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 197 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
198 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 198 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
199 <if expr="not is_android or pp_ifdef('google_tv')"> 199 <if expr="not is_android or pp_ifdef('google_tv')">
200 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 200 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
201 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 201 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
202 </if> 202 </if>
203 <if expr="not is_android or pp_ifdef('google_tv')"> 203 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
204 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 204 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />
205 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="B INDATA" />
206 </if>
207 <if expr="pp_ifdef('enable_plugins')"> 205 <if expr="pp_ifdef('enable_plugins')">
208 <include name="IDR_PDF_MANIFEST" file="resources\pdf\manifest.json" type ="BINDATA" /> 206 <include name="IDR_PDF_MANIFEST" file="resources\pdf\manifest.json" type ="BINDATA" />
209 </if> 207 </if>
210 <if expr="is_android and pp_ifdef('google_tv')"> 208 <if expr="is_android and pp_ifdef('google_tv')">
211 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_tv.json" type="BINDATA" /> 209 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_tv.json" type="BINDATA" />
212 </if> 210 </if>
213 <if expr="is_win"> 211 <if expr="is_win">
214 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 212 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
215 </if> 213 </if>
216 <if expr="is_macosx"> 214 <if expr="is_macosx">
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 411 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
414 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 412 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
415 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 413 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
416 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" /> 414 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" />
417 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" /> 415 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" />
418 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" /> 416 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" />
419 </if> 417 </if>
420 </includes> 418 </includes>
421 </release> 419 </release>
422 </grit> 420 </grit>
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698