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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 8 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 side-by-side diff with in-line comments

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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_resources.grd

diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd

index cbc85bcd1a545781e378a39a3b734711f84d9e9a..a4c175c21c68b84c138a1a146eddc8ae29c7d4c8 100644

--- a/chrome/browser/resources/settings/settings_resources.grd

+++ b/chrome/browser/resources/settings/settings_resources.grd

@@ -490,6 +490,22 @@

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

+ <if expr="chromeos">

tommycli 2016/05/02 16:11:27 There's an existing chromeos only section below at

jdufault 2016/05/03 19:21:58 Done.

+ <structure name="IDR_SETTINGS_PIN_CSS"

+ file="people_page/pin.css"

+ type="chrome_html"

+ flattenhtml="true" />

+ <structure name="IDR_SETTINGS_PIN_HTML"

+ file="people_page/pin.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true"/>

+ <structure name="IDR_SETTINGS_PIN_JS"

+ file="people_page/pin.js"

+ type="chrome_html"

+ flattenhtml="true" />

+ </if>

<structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"

file="people_page/manage_profile.html"