chrome/browser/resources/settings/settings_resources.grd - Issue 2013963003: Add the Mac OSX Keychain message to the Passwords Page.

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

Issue 2013963003: Add the Mac OSX Keychain message to the Passwords Page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« chrome/app/settings_strings.grdp ('K') | « chrome/browser/resources/settings/passwords_and_forms_page/passwords_section.html ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.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/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 452 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
463 file="passwords_and_forms_page/passwords_shared_css.html"	463 file="passwords_and_forms_page/passwords_shared_css.html"

464 type="chrome_html" />	464 type="chrome_html" />

465 <structure name="IDR_SETTINGS_AUTOFILL_SECTION_HTML"	465 <structure name="IDR_SETTINGS_AUTOFILL_SECTION_HTML"

466 file="passwords_and_forms_page/autofill_section.html"	466 file="passwords_and_forms_page/autofill_section.html"

467 type="chrome_html" />	467 type="chrome_html" />

468 <structure name="IDR_SETTINGS_AUTOFILL_SECTION_JS"	468 <structure name="IDR_SETTINGS_AUTOFILL_SECTION_JS"

469 file="passwords_and_forms_page/autofill_section.js"	469 file="passwords_and_forms_page/autofill_section.js"

470 type="chrome_html" />	470 type="chrome_html" />

471 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"	471 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"

472 file="passwords_and_forms_page/passwords_section.html"	472 file="passwords_and_forms_page/passwords_section.html"

	473 flattenhtml="true"
	Dan Beam 2016/05/26 18:57:28 nit: can this be preprocess=true now instead? nit: can this be preprocess=true now instead? hcarmona 2016/05/26 19:29:01 Not needed anymore. Show quoted text On 2016/05/26 18:57:28, Dan Beam wrote: > nit: can this be preprocess=true now instead? Not needed anymore.
473 type="chrome_html" />	474 type="chrome_html" />

474 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_JS"	475 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_JS"

475 file="passwords_and_forms_page/passwords_section.js"	476 file="passwords_and_forms_page/passwords_section.js"

476 type="chrome_html" />	477 type="chrome_html" />

477 <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_HTML"	478 <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_HTML"

478 file="passwords_and_forms_page/password_edit_dialog.html"	479 file="passwords_and_forms_page/password_edit_dialog.html"

479 type="chrome_html" />	480 type="chrome_html" />

480 <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_JS"	481 <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_JS"

481 file="passwords_and_forms_page/password_edit_dialog.js"	482 file="passwords_and_forms_page/password_edit_dialog.js"

482 type="chrome_html" />	483 type="chrome_html" />

(...skipping 401 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
884 type="chrome_html" />	885 type="chrome_html" />

885 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	886 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

886 file="people_page/users_page.html"	887 file="people_page/users_page.html"

887 type="chrome_html"	888 type="chrome_html"

888 flattenhtml="true"	889 flattenhtml="true"

889 allowexternalscript="true" />	890 allowexternalscript="true" />

890 </if>	891 </if>

891 </structures>	892 </structures>

892 </release>	893 </release>

893 </grit>	894 </grit>

OLD	NEW