chrome/browser/resources/settings/settings_resources.grd - Issue 1933913002: Add a very basic PIN UI implementation that is shared between lock and settings.

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: 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

« chrome/browser/resources/settings/people_page/people_page.js ('K') | « chrome/browser/resources/settings/people_page/pin.js ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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 472 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
483 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"	483 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"

484 file="people_page/people_page.html"	484 file="people_page/people_page.html"

485 type="chrome_html"	485 type="chrome_html"

486 flattenhtml="true"	486 flattenhtml="true"

487 allowexternalscript="true" />	487 allowexternalscript="true" />

488 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"	488 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"

489 file="people_page/people_page.js"	489 file="people_page/people_page.js"

490 type="chrome_html"	490 type="chrome_html"

491 flattenhtml="true"	491 flattenhtml="true"

492 allowexternalscript="true" />	492 allowexternalscript="true" />

	493 <if expr="chromeos">
	tommycli 2016/05/02 16:11:27 There's an existing chromeos only section below at There's an existing chromeos only section below at line 751. jdufault 2016/05/03 19:21:58 Done. Show quoted text On 2016/05/02 16:11:27, tommycli wrote: > There's an existing chromeos only section below at line 751. Done.
	494 <structure name="IDR_SETTINGS_PIN_CSS"

	495 file="people_page/pin.css"

	496 type="chrome_html"

	497 flattenhtml="true" />

	498 <structure name="IDR_SETTINGS_PIN_HTML"

	499 file="people_page/pin.html"

	500 type="chrome_html"

	501 flattenhtml="true"

	502 allowexternalscript="true"/>

	503 <structure name="IDR_SETTINGS_PIN_JS"

	504 file="people_page/pin.js"

	505 type="chrome_html"

	506 flattenhtml="true" />

	507 </if>

	508

493 <if expr="not chromeos">	509 <if expr="not chromeos">

494 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"	510 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"

495 file="people_page/manage_profile.html"	511 file="people_page/manage_profile.html"

496 type="chrome_html"	512 type="chrome_html"

497 flattenhtml="true"	513 flattenhtml="true"

498 allowexternalscript="true" />	514 allowexternalscript="true" />

499 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"	515 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"

500 file="people_page/manage_profile.js"	516 file="people_page/manage_profile.js"

501 type="chrome_html" />	517 type="chrome_html" />

502 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_H TML"	518 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_H TML"

(...skipping 439 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
942 type="chrome_html"	958 type="chrome_html"

943 flattenhtml="true"	959 flattenhtml="true"

944 allowexternalscript="true" />	960 allowexternalscript="true" />

945 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	961 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

946 file="people_page/users_page.css"	962 file="people_page/users_page.css"

947 type="chrome_html" />	963 type="chrome_html" />

948 </if>	964 </if>

949 </structures>	965 </structures>

950 </release>	966 </release>

951 </grit>	967 </grit>

OLD	NEW