chrome/browser/browser_resources.grd - Issue 389913002: Moving IME manifests to chrome resources.

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

Issue 389913002: Moving IME manifests to chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed duplicated XKB extension loading. 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

« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc » ('j') | chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Loading...
419 </if>	419 </if>

420 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />	420 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />

421 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />	421 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />

422 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />	422 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />

423 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />	423 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />

424 <if expr="chromeos">	424 <if expr="chromeos">

425 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />	425 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />

426 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />	426 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />

427 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />	427 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />

428 </if>	428 </if>

	429 <if expr="chromeos">

	430 <if expr="_google_chrome">

	431 <include name="IDR_GOOGLE_XKB_MANIFEST" file="resources\chromeos\input _method\google_xkb_manifest.json" type="BINDATA" />

	432 <include name="IDR_GOOGLE_INPUT_TOOLS_MANIFEST" file="resources\chrome os\input_method\google_input_tools_manifest.json" type="BINDATA" />

	433 </if>

	434 <if expr="not _google_chrome">

	435 <include name="IDR_XKB_MANIFEST" file="resources\chromeos\input_method \xkb_manifest.json" type="BINDATA" />

	436 <include name="IDR_M17N_MANIFEST" file="resources\chromeos\input_metho d\m17n_manifest.json" type="BINDATA" />

	437 <include name="IDR_PINYIN_MANIFEST" file="resources\chromeos\input_met hod\pinyin_manifest.json" type="BINDATA" />

	438 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" />

	439 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />

	440 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />

	441 </if>

	442 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />

	443 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />

	444 </if>

429 </includes>	445 </includes>

430 </release>	446 </release>

431 </grit>	447 </grit>

OLD	NEW