chrome/browser/resources/settings/settings_resources.grd - Issue 1503403004: Settings People Rewrite: Move users_page as subpage of 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 1503403004: Settings People Rewrite: Move users_page as subpage of People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0053-people-rename-a-bunch-of-stuff

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

« chrome/browser/resources/settings/settings_page/settings_router.js ('K') | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/resources/settings/users_page/user_list.css » ('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 1ec4576a6358e2029088179e8c46aeda1ec101a3..34c8e782602eb998b5ad4aa5a430e5b39b620897 100644

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

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

@@ -313,7 +313,9 @@

type="chrome_html" />

<structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"

file="people_page/people_page.js"

- type="chrome_html" />

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

<structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"

file="people_page/people_page.html"

type="chrome_html"

@@ -633,26 +635,26 @@

file="internet_page/network_summary_item.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"

- file="users_page/user_list.js"

+ file="people_page/user_list.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"

- file="users_page/user_list.html"

+ file="people_page/user_list.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

<structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"

- file="users_page/user_list.css"

+ file="people_page/user_list.css"

type="chrome_html" />

<structure name="IDR_SETTINGS_USERS_PAGE_JS"

- file="users_page/users_page.js"

+ file="people_page/users_page.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_USERS_PAGE_HTML"

- file="users_page/users_page.html"

+ file="people_page/users_page.html"

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

<structure name="IDR_SETTINGS_USERS_PAGE_CSS"

- file="users_page/users_page.css"

+ file="people_page/users_page.css"

type="chrome_html" />

</if>

</structures>