chrome/browser/resources/settings/settings_resources.grd - Issue 1632403003: [MD settings] download mocks changes; added disable option for google drive

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 1632403003: [MD settings] download mocks changes; added disable option for google drive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master 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

« no previous file with comments | « chrome/browser/resources/settings/downloads_page/downloads_page.html ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('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 1ed41e9a3595197807551cd66c190e3d99f0ba0b..065f3a4fefaefe0f903af0326a9721fb418492a6 100644

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

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

@@ -225,7 +225,9 @@

type="chrome_html" />

<structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"

file="downloads_page/downloads_page.html"

- type="chrome_html" />

+ type="chrome_html"

+ flattenhtml="true"

+ allowexternalscript="true" />

stevenjb 2016/01/27 19:30:18 Remind me why exactly we need each of these?

Dan Beam 2016/01/27 19:31:37 flatten: grit allowexternalscript: no idea, but it

<structure name="IDR_SETTINGS_DOWNLOADS_PAGE_JS"

file="downloads_page/downloads_page.js"

type="chrome_html" />