chrome/browser/resources/settings/settings_resources.grd - Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

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 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge upstream changes Created 5 years 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/settings_menu/settings_menu.html ('k') | chrome/browser/resources/settings/signin_page/signin_page.html » ('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 4d44889e1a840938a9be340352a7cf40e904f617..5b28fe55849d740b4f7b89b0d6ed055cc22902c3 100644

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

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

@@ -320,6 +320,14 @@

<structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"

file="passwords_and_forms_page/passwords_and_forms_page.js"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"

+ file="people_page/people_page.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"

+ file="people_page/people_page.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

<structure name="IDR_SETTINGS_PREF_UTIL_HTML"

file="prefs/pref_util.html"

type="chrome_html" />

@@ -478,32 +486,22 @@

<structure name="IDR_SETTINGS_SEARCH_PAGE_CSS"

file="search_page/search_page.css"

type="chrome_html" />

- <if expr="not chromeos">

- <structure name="IDR_SETTINGS_SIGNIN_PAGE_JS"

- file="signin_page/signin_page.js"

- type="chrome_html" />

- <structure name="IDR_SETTINGS_SIGNIN_PAGE_HTML"

- file="signin_page/signin_page.html"

- type="chrome_html"

- flattenhtml="true"

- allowexternalscript="true" />

- </if>

<structure name="IDR_SETTINGS_SYNC_PAGE_JS"

- file="sync_page/sync_page.js"

+ file="people_page/sync_page.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_SYNC_PAGE_HTML"

- file="sync_page/sync_page.html"

+ file="people_page/sync_page.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

<structure name="IDR_SETTINGS_SYNC_PAGE_CSS"

- file="sync_page/sync_page.css"

+ file="people_page/sync_page.css"

type="chrome_html" />

<structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS"

- file="sync_page/sync_private_api.js"

+ file="people_page/sync_private_api.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML"

- file="sync_page/sync_private_api.html"

+ file="people_page/sync_private_api.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />