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

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

Issue 1933913002: Add a very basic PIN UI implementation that is shared between lock and settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix tests by removing a previously unused import that started getting used b/c of resource loader c… Created 4 years, 7 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
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/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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 flattenhtml="true" 924 flattenhtml="true"
925 allowexternalscript="true" /> 925 allowexternalscript="true" />
926 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS" 926 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS"
927 file="people_page/easy_unlock_turn_off_dialog.js" 927 file="people_page/easy_unlock_turn_off_dialog.js"
928 type="chrome_html" /> 928 type="chrome_html" />
929 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML" 929 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"
930 file="people_page/easy_unlock_turn_off_dialog.html" 930 file="people_page/easy_unlock_turn_off_dialog.html"
931 type="chrome_html" 931 type="chrome_html"
932 flattenhtml="true" 932 flattenhtml="true"
933 allowexternalscript="true" /> 933 allowexternalscript="true" />
934 <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML"
935 file="people_page/pin_keyboard.html"
936 type="chrome_html"
937 flattenhtml="true"
938 allowexternalscript="true"/>
939 <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
940 file="people_page/pin_keyboard.js"
941 type="chrome_html"
942 flattenhtml="true" />
934 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS" 943 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"
935 file="people_page/user_list.js" 944 file="people_page/user_list.js"
936 type="chrome_html" /> 945 type="chrome_html" />
937 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML" 946 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"
938 file="people_page/user_list.html" 947 file="people_page/user_list.html"
939 type="chrome_html" 948 type="chrome_html"
940 flattenhtml="true" 949 flattenhtml="true"
941 allowexternalscript="true" /> 950 allowexternalscript="true" />
942 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS" 951 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"
943 file="people_page/user_list.css" 952 file="people_page/user_list.css"
944 type="chrome_html" /> 953 type="chrome_html" />
945 <structure name="IDR_SETTINGS_USERS_PAGE_JS" 954 <structure name="IDR_SETTINGS_USERS_PAGE_JS"
946 file="people_page/users_page.js" 955 file="people_page/users_page.js"
947 type="chrome_html" /> 956 type="chrome_html" />
948 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 957 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
949 file="people_page/users_page.html" 958 file="people_page/users_page.html"
950 type="chrome_html" 959 type="chrome_html"
951 flattenhtml="true" 960 flattenhtml="true"
952 allowexternalscript="true" /> 961 allowexternalscript="true" />
953 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 962 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
954 file="people_page/users_page.css" 963 file="people_page/users_page.css"
955 type="chrome_html" /> 964 type="chrome_html" />
956 </if> 965 </if>
957 </structures> 966 </structures>
958 </release> 967 </release>
959 </grit> 968 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/people_page/pin_keyboard.js ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698