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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 102373006: Merge 240486 "Implement the spring charger replacement UI and ad..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1650/src/
Patch Set: Created 7 years 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 | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/charger_replace/charger_link_dialog.h » ('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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" /> 317 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" />
318 <include name="IDR_MERGE_SESSION_LOAD_HTML" file="resources\chromeos\mer ge_session_load.html" flattenhtml="true" type="BINDATA" /> 318 <include name="IDR_MERGE_SESSION_LOAD_HTML" file="resources\chromeos\mer ge_session_load.html" flattenhtml="true" type="BINDATA" />
319 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> 319 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" />
320 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 320 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
321 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" /> 321 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" />
322 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 322 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
323 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" /> 323 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" />
324 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" /> 324 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" />
325 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" /> 325 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" />
326 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" /> 326 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" />
327 <include name="IDR_CHARGER_REPLACEMENT_HTML" file="resources\chromeos\ch arger_replacement.html" flattenhtml="true" type="BINDATA" />
327 </if> 328 </if>
328 <if expr="pp_ifdef('file_manager_extension')"> 329 <if expr="pp_ifdef('file_manager_extension')">
329 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 330 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
330 </if> 331 </if>
331 <if expr="pp_ifdef('image_loader_extension')"> 332 <if expr="pp_ifdef('image_loader_extension')">
332 <include name="IDR_IMAGE_LOADER_MANIFEST" file="resources\image_loader\m anifest.json" type="BINDATA" /> 333 <include name="IDR_IMAGE_LOADER_MANIFEST" file="resources\image_loader\m anifest.json" type="BINDATA" />
333 </if> 334 </if>
334 <if expr="pp_ifdef('chromeos')"> 335 <if expr="pp_ifdef('chromeos')">
335 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" /> 336 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" />
336 </if> 337 </if>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 </if> 387 </if>
387 <if expr="pp_ifdef('chromeos')"> 388 <if expr="pp_ifdef('chromeos')">
388 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" /> 389 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" />
389 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 390 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
390 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 391 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
391 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 392 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
392 </if> 393 </if>
393 </includes> 394 </includes>
394 </release> 395 </release>
395 </grit> 396 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/charger_replace/charger_link_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698