chrome/browser/resources/settings/settings_resources.grd - Issue 2827553002: MD Settings: Use a browser proxy from the languages page. Re-enable test.

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 2827553002: MD Settings: Use a browser proxy from the languages page. Re-enable test. (Closed)

Patch Set: Remove accidental usage of getInputMethodPrivate() on non-Cros Created 3 years, 8 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:

« no previous file with comments | « chrome/browser/resources/settings/languages_page/languages_browser_proxy.js ('k') | chrome/test/data/webui/settings/cr_settings_browsertest.js » ('j') | no next file with comments »
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" output_all_resource_defines= "false">	2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">

3 <outputs>	3 <outputs>

4 <output filename="grit/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 590 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
601 file="reset_page/reset_browser_proxy.html"	601 file="reset_page/reset_browser_proxy.html"

602 type="chrome_html" />	602 type="chrome_html" />

603 <structure name="IDR_SETTINGS_LANGUAGES_HTML"	603 <structure name="IDR_SETTINGS_LANGUAGES_HTML"

604 file="languages_page/languages.html"	604 file="languages_page/languages.html"

605 type="chrome_html" />	605 type="chrome_html" />

606 <structure name="IDR_SETTINGS_LANGUAGES_JS"	606 <structure name="IDR_SETTINGS_LANGUAGES_JS"

607 file="languages_page/languages.js"	607 file="languages_page/languages.js"

608 type="chrome_html"	608 type="chrome_html"

609 preprocess="true"	609 preprocess="true"

610 allowexternalscript="true" />	610 allowexternalscript="true" />

	611 <structure name="IDR_SETTINGS_LANGUAGES_BROWSER_PROXY_HTML"

	612 file="languages_page/languages_browser_proxy.html"

	613 type="chrome_html" />

	614 <structure name="IDR_SETTINGS_LANGUAGES_BROWSER_PROXY_JS"

	615 file="languages_page/languages_browser_proxy.js"

	616 preprocess="true"

	617 type="chrome_html" />

611 <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"	618 <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"

612 file="languages_page/add_languages_dialog.html"	619 file="languages_page/add_languages_dialog.html"

613 type="chrome_html" />	620 type="chrome_html" />

614 <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_JS"	621 <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_JS"

615 file="languages_page/add_languages_dialog.js"	622 file="languages_page/add_languages_dialog.js"

616 type="chrome_html" />	623 type="chrome_html" />

617 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"	624 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"

618 file="languages_page/languages_page.html"	625 file="languages_page/languages_page.html"

619 type="chrome_html"	626 type="chrome_html"

620 preprocess="true"	627 preprocess="true"

(...skipping 677 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1298 type="chrome_html" />	1305 type="chrome_html" />

1299 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1306 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1300 file="people_page/users_page.html"	1307 file="people_page/users_page.html"

1301 type="chrome_html"	1308 type="chrome_html"

1302 preprocess="true"	1309 preprocess="true"

1303 allowexternalscript="true" />	1310 allowexternalscript="true" />

1304 </if>	1311 </if>

1305 </structures>	1312 </structures>

1306 </release>	1313 </release>

1307 </grit>	1314 </grit>

OLD	NEW