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

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

Download patch

« no previous file with comments | « 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 »
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 a70b4501a7a619e94a568ece9e41eaf443cc6dd5..5596fa65e4f2bfb7f76fb8b5b9a10eccca5865bf 100644

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

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

@@ -825,11 +825,17 @@

type="chrome_html" />

<structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_JS"

file="people_page/change_picture_browser_proxy.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_HTML"

+ file="people_page/change_picture_browser_proxy.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

- <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_HTML"

- file="people_page/change_picture_browser_proxy.html"

+ <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_JS"

+ file="people_page/easy_unlock_browser_proxy.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_HTML"

+ file="people_page/easy_unlock_browser_proxy.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />