chrome/browser/resources/settings/settings_resources.grd - Issue 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture

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 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix camera presence observer Created 4 years, 11 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/change_picture_private_api.js ('K') | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/chromeos/change_picture_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 96a8e002d3cc5f7ee090238555e1286af99041ee..e9041029afb446081d1c7ad27bd836afe907f9fb 100644

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

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

@@ -343,7 +343,9 @@

type="chrome_html" />

<structure name="IDR_SETTINGS_PEOPLE_PAGE_CSS"

file="people_page/people_page.css"

- 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"

@@ -538,7 +540,9 @@

type="chrome_html" />

<structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS"

file="people_page/sync_private_api.js"

- type="chrome_html" />

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

<structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML"

file="people_page/sync_private_api.html"

type="chrome_html"

@@ -704,6 +708,27 @@

<structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_JS"

file="internet_page/network_summary_item.js"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_PRIVATE_API_JS"

+ file="people_page/change_picture_private_api.js"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_CSS"

+ file="people_page/change_picture.css"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_HTML"

+ file="people_page/change_picture.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_JS"

+ file="people_page/change_picture.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_PRIVATE_API_HTML"

+ file="people_page/change_picture_private_api.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

<structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"

file="people_page/user_list.js"

type="chrome_html" />