chrome/browser/resources/settings/settings_resources.grd - Issue 2098663002: Add settings screen that lets a user setup a PIN to unlock their device with.

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

Issue 2098663002: Add settings screen that lets a user setup a PIN to unlock their device with. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-choose-method

Patch Set: Rebase account for parent CL changes Created 4 years, 5 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/browser/resources/settings/people_page/quick_unlock_setup_pin.js ('K') | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('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">	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 955 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
966 flattenhtml="true"	966 flattenhtml="true"

967 allowexternalscript="true" />	967 allowexternalscript="true" />

968 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS"	968 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS"

969 file="people_page/quick_unlock_choose_method.js"	969 file="people_page/quick_unlock_choose_method.js"

970 type="chrome_html" />	970 type="chrome_html" />

971 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML"	971 <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML"

972 file="people_page/quick_unlock_choose_method.html"	972 file="people_page/quick_unlock_choose_method.html"

973 type="chrome_html"	973 type="chrome_html"

974 flattenhtml="true"	974 flattenhtml="true"

975 allowexternalscript="true" />	975 allowexternalscript="true" />

	976 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_JS"

	977 file="people_page/quick_unlock_setup_pin.js"

	978 type="chrome_html" />

	979 <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_HTML"

	980 file="people_page/quick_unlock_setup_pin.html"

	981 type="chrome_html"

	982 flattenhtml="true"

	983 allowexternalscript="true" />

976 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_JS"	984 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_JS"

977 file="people_page/quick_unlock_routing_behavior.js"	985 file="people_page/quick_unlock_routing_behavior.js"

978 type="chrome_html" />	986 type="chrome_html" />

979 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_HTML"	987 <structure name="IDR_SETTINGS_QUICK_UNLOCK_ROUTING_BEHAVIOR_HTML"

980 file="people_page/quick_unlock_routing_behavior.html"	988 file="people_page/quick_unlock_routing_behavior.html"

981 type="chrome_html"	989 type="chrome_html"

982 flattenhtml="true"	990 flattenhtml="true"

983 allowexternalscript="true" />	991 allowexternalscript="true" />

984 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"	992 <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"

985 file="people_page/quick_unlock_password_detect_behavior.js"	993 file="people_page/quick_unlock_password_detect_behavior.js"

(...skipping 28 matching lines...) Expand all Loading...
1014 type="chrome_html" />	1022 type="chrome_html" />

1015 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1023 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1016 file="people_page/users_page.html"	1024 file="people_page/users_page.html"

1017 type="chrome_html"	1025 type="chrome_html"

1018 flattenhtml="true"	1026 flattenhtml="true"

1019 allowexternalscript="true" />	1027 allowexternalscript="true" />

1020 </if>	1028 </if>

1021 </structures>	1029 </structures>

1022 </release>	1030 </release>

1023 </grit>	1031 </grit>

OLD	NEW