chrome/browser/resources/settings/settings_resources.grd - Issue 1775803002: MD Settings: add a semi-functional System page

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

Issue 1775803002: MD Settings: add a semi-functional System page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v2-md_history

Patch Set: stevenjb@ review 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/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/system_page/compiled_resources2.gyp » ('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 f0d587d09b877a76f6d8de59a02bebf933dc8050..4d9564a586127560db3c7e97e8494df419001019 100644

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

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

@@ -22,6 +22,7 @@

allowexternalscript="true" />

<structure name="IDR_SETTINGS_ADVANCED_PAGE_JS"

file="advanced_page/advanced_page.js"

+ flattenhtml="true"

type="chrome_html" />

<structure name="IDR_SETTINGS_ADVANCED_PAGE_HTML"

file="advanced_page/advanced_page.html"

@@ -600,6 +601,19 @@

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_SYSTEM_PAGE_DELEGATE_HTML"

+ file="system_page/system_page_delegate.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_SYSTEM_PAGE_DELEGATE_JS"

+ file="system_page/system_page_delegate.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_SYSTEM_PAGE_HTML"

+ file="system_page/system_page.html"

+ flattenhtml="true"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"

+ file="system_page/system_page.js"

+ type="chrome_html" />

<structure name="IDR_SETTINGS_SETTINGS_HTML"

file="settings.html"

type="chrome_html" />

@@ -763,38 +777,38 @@

<structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_JS"

file="internet_page/network_summary_item.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_CSS"

- file="people_page/camera.css"

- type="chrome_html" />

- <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_HTML"

- file="people_page/camera.html"

- type="chrome_html"

- flattenhtml="true"

- allowexternalscript="true" />

- <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_JS"

- file="people_page/camera.js"

- type="chrome_html" />

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

+ file="people_page/camera.css"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_HTML"

+ file="people_page/camera.html"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_JS"

+ file="people_page/camera.js"

+ type="chrome_html" />

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

- file="people_page/change_picture_private_api.js"

- type="chrome_html"

- flattenhtml="true"

- allowexternalscript="true" />

+ file="people_page/change_picture_private_api.js"

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

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

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