chrome/browser/resources/settings/settings_resources.grd - Issue 2208473007: Rework quick unlock settings to follow new specs.

Unified Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Fix closure (bad merge) Created 4 years, 4 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

« no previous file with comments | « chrome/browser/resources/settings/route.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »
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 4b8d332d9f1e40ab151a8a63e3e0b65882a1c53d..36279116bca248c790e3e4228bcc0afb9bbddfa1 100644

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

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

@@ -1033,40 +1033,40 @@

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

- <structure name="IDR_SETTINGS_PIN_KEYBOARD_HTML"

- file="people_page/pin_keyboard.html"

- type="chrome_html"

- flattenhtml="true"

- allowexternalscript="true"/>

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_JS"

- file="people_page/quick_unlock_authenticate.js"

+ <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_JS"

+ file="people_page/password_prompt_dialog.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_AUTHENTICATE_HTML"

- file="people_page/quick_unlock_authenticate.html"

+ <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_HTML"

+ file="people_page/password_prompt_dialog.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_JS"

- file="people_page/quick_unlock_choose_method.js"

+ <structure name="IDR_SETTINGS_PEOPLE_PIN_KEYBOARD_HTML"

+ file="people_page/pin_keyboard.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true"/>

+ <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_JS"

+ file="people_page/lock_screen.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_CHOOSE_METHOD_HTML"

- file="people_page/quick_unlock_choose_method.html"

+ <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_HTML"

+ file="people_page/lock_screen.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_JS"

- file="people_page/quick_unlock_setup_pin.js"

+ <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_JS"

+ file="people_page/lock_state_behavior.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_SETUP_PIN_HTML"

- file="people_page/quick_unlock_setup_pin.html"

+ <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_HTML"

+ file="people_page/lock_state_behavior.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_JS"

- file="people_page/quick_unlock_password_detect_behavior.js"

+ <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"

+ file="people_page/setup_pin_dialog.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_QUICK_UNLOCK_PASSWORD_DETECT_BEHAVIOR_HTML"

- file="people_page/quick_unlock_password_detect_behavior.html"

+ <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"

+ file="people_page/setup_pin_dialog.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />