chrome/browser/resources/settings/settings_resources.grd - Issue 1806123002: Settings People Revamp: Easy Unlock: Add browser proxy and setup flow.

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

Issue 1806123002: Settings People Revamp: Easy Unlock: Add browser proxy and setup flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/people_page.js ('K') | « chrome/browser/resources/settings/people_page/people_page.js ('k') | chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h » ('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 807 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
818 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_HTML"	818 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_HTML"

819 file="people_page/change_picture.html"	819 file="people_page/change_picture.html"

820 type="chrome_html"	820 type="chrome_html"

821 flattenhtml="true"	821 flattenhtml="true"

822 allowexternalscript="true" />	822 allowexternalscript="true" />

823 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_JS"	823 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_JS"

824 file="people_page/change_picture.js"	824 file="people_page/change_picture.js"

825 type="chrome_html" />	825 type="chrome_html" />

826 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_JS"	826 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_JS"

827 file="people_page/change_picture_browser_proxy.js"	827 file="people_page/change_picture_browser_proxy.js"

828 type="chrome_html"	828 type="chrome_html" />

829 flattenhtml="true"

830 allowexternalscript="true" />

831 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_HTML"	829 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_HTML"

832 file="people_page/change_picture_browser_proxy.html"	830 file="people_page/change_picture_browser_proxy.html"

833 type="chrome_html"	831 type="chrome_html"

834 flattenhtml="true"	832 flattenhtml="true"

835 allowexternalscript="true" />	833 allowexternalscript="true" />

	834 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_JS"

	835 file="people_page/easy_unlock_browser_proxy.js"

	836 type="chrome_html" />

	837 <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_HTML"

	838 file="people_page/easy_unlock_browser_proxy.html"

	839 type="chrome_html"

	840 flattenhtml="true"

	841 allowexternalscript="true" />

836 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"	842 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"

837 file="people_page/user_list.js"	843 file="people_page/user_list.js"

838 type="chrome_html" />	844 type="chrome_html" />

839 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"	845 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"

840 file="people_page/user_list.html"	846 file="people_page/user_list.html"

841 type="chrome_html"	847 type="chrome_html"

842 flattenhtml="true"	848 flattenhtml="true"

843 allowexternalscript="true" />	849 allowexternalscript="true" />

844 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"	850 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"

845 file="people_page/user_list.css"	851 file="people_page/user_list.css"

846 type="chrome_html" />	852 type="chrome_html" />

847 <structure name="IDR_SETTINGS_USERS_PAGE_JS"	853 <structure name="IDR_SETTINGS_USERS_PAGE_JS"

848 file="people_page/users_page.js"	854 file="people_page/users_page.js"

849 type="chrome_html" />	855 type="chrome_html" />

850 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	856 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

851 file="people_page/users_page.html"	857 file="people_page/users_page.html"

852 type="chrome_html"	858 type="chrome_html"

853 flattenhtml="true"	859 flattenhtml="true"

854 allowexternalscript="true" />	860 allowexternalscript="true" />

855 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	861 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

856 file="people_page/users_page.css"	862 file="people_page/users_page.css"

857 type="chrome_html" />	863 type="chrome_html" />

858 </if>	864 </if>

859 </structures>	865 </structures>

860 </release>	866 </release>

861 </grit>	867 </grit>

OLD	NEW