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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23548023: Add a new component app Guide to Chrome (code name GeniusApp) to replace HelpApp. Add a command lin… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update manifest.json Created 7 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/genius_app/app_id.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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" /> 334 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" />
335 </if> 335 </if>
336 <if expr="pp_ifdef('chromeos')"> 336 <if expr="pp_ifdef('chromeos')">
337 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" /> 337 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" />
338 </if> 338 </if>
339 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" > 339 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" >
340 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 340 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
341 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 341 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
342 </if> 342 </if>
343 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 343 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
344 <include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_ app\manifest.json" type="BINDATA" />
344 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 345 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
345 <include name="IDR_QUICKOFFICE_VIEWING_MANIFEST" file="resources\quick_o ffice\manifest_viewing.json" type="BINDATA" /> 346 <include name="IDR_QUICKOFFICE_VIEWING_MANIFEST" file="resources\quick_o ffice\manifest_viewing.json" type="BINDATA" />
346 <include name="IDR_QUICKOFFICE_EDITOR_MANIFEST" file="resources\quick_of fice\manifest_editor.json" type="BINDATA" /> 347 <include name="IDR_QUICKOFFICE_EDITOR_MANIFEST" file="resources\quick_of fice\manifest_editor.json" type="BINDATA" />
347 </if> 348 </if>
348 <if expr="pp_ifdef('chromeos')"> 349 <if expr="pp_ifdef('chromeos')">
349 <include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type=" BINDATA" /> 350 <include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type=" BINDATA" />
350 <include name="IDR_SALSA_HTML" file="resources\chromeos\salsa.html" type ="BINDATA" /> 351 <include name="IDR_SALSA_HTML" file="resources\chromeos\salsa.html" type ="BINDATA" />
351 <include name="IDR_SALSA_JS" file="resources\chromeos\salsa.js" type="BI NDATA" /> 352 <include name="IDR_SALSA_JS" file="resources\chromeos\salsa.js" type="BI NDATA" />
352 </if> 353 </if>
353 <if expr="pp_ifdef('use_ash')"> 354 <if expr="pp_ifdef('use_ash')">
(...skipping 23 matching lines...) Expand all
377 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" /> 378 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" />
378 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" /> 379 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" />
379 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" /> 380 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" />
380 </if> 381 </if>
381 <if expr="pp_ifdef('_google_chrome')"> 382 <if expr="pp_ifdef('_google_chrome')">
382 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" /> 383 <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings_internal \pref_hash_seed.bin" type="BINDATA" />
383 </if> 384 </if>
384 </includes> 385 </includes>
385 </release> 386 </release>
386 </grit> 387 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/genius_app/app_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698