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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 834233005: Make Easy Unlock app have separate instance in incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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
« no previous file with comments | « no previous file | chrome/browser/resources/easy_unlock/manifest_signin.json » ('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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 </if> 419 </if>
420 <if expr="chromeos"> 420 <if expr="chromeos">
421 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 421 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
422 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 422 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
423 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 423 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
424 </if> 424 </if>
425 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" /> 425 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />
426 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" /> 426 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />
427 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 427 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
428 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" /> 428 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />
429 <include name="IDR_EASY_UNLOCK_MANIFEST_SIGNIN" file="resources\easy_unloc k\manifest_signin.json" type="BINDATA" />
429 <if expr="chromeos"> 430 <if expr="chromeos">
430 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" /> 431 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />
431 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> 432 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />
432 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" /> 433 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />
433 </if> 434 </if>
434 <if expr="chromeos"> 435 <if expr="chromeos">
435 <if expr="_google_chrome"> 436 <if expr="_google_chrome">
436 <include name="IDR_GOOGLE_XKB_MANIFEST" file="resources\chromeos\input _method\google_xkb_manifest.json" type="BINDATA" /> 437 <include name="IDR_GOOGLE_XKB_MANIFEST" file="resources\chromeos\input _method\google_xkb_manifest.json" type="BINDATA" />
437 <include name="IDR_GOOGLE_INPUT_TOOLS_MANIFEST" file="resources\chrome os\input_method\google_input_tools_manifest.json" type="BINDATA" /> 438 <include name="IDR_GOOGLE_INPUT_TOOLS_MANIFEST" file="resources\chrome os\input_method\google_input_tools_manifest.json" type="BINDATA" />
438 </if> 439 </if>
439 <if expr="not _google_chrome"> 440 <if expr="not _google_chrome">
440 <include name="IDR_XKB_MANIFEST" file="resources\chromeos\input_method \xkb_manifest.json" type="BINDATA" /> 441 <include name="IDR_XKB_MANIFEST" file="resources\chromeos\input_method \xkb_manifest.json" type="BINDATA" />
441 <include name="IDR_M17N_MANIFEST" file="resources\chromeos\input_metho d\m17n_manifest.json" type="BINDATA" /> 442 <include name="IDR_M17N_MANIFEST" file="resources\chromeos\input_metho d\m17n_manifest.json" type="BINDATA" />
442 <include name="IDR_PINYIN_MANIFEST" file="resources\chromeos\input_met hod\pinyin_manifest.json" type="BINDATA" /> 443 <include name="IDR_PINYIN_MANIFEST" file="resources\chromeos\input_met hod\pinyin_manifest.json" type="BINDATA" />
443 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" /> 444 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" />
444 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 445 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
445 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 446 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
446 </if> 447 </if>
447 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 448 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
448 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 449 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
449 </if> 450 </if>
450 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 451 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
451 </includes> 452 </includes>
452 </release> 453 </release>
453 </grit> 454 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/easy_unlock/manifest_signin.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698