chrome/browser/resources/settings/settings_resources.grd - Issue 2952463002: App list sync unit tests

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 2952463002: App list sync unit tests (Closed)

Patch Set: Add in dummy hooks for assistant settings launcher Created 3 years, 5 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:

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 5a8c40e230d90d1210a6aeac2b1188c75a7481d1..77a1c724bd14770f49e86ed654312b8df68e928b 100644

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

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

@@ -1017,6 +1017,26 @@

type="chrome_html"

preprocess="true"

allowexternalscript="true" />

+ <if expr="chromeos">

+ <structure name="IDR_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_PAGE_JS"

+ file="google_assistant_page/google_assistant_page.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_PAGE_HTML"

+ file="google_assistant_page/google_assistant_page.html"

+ type="chrome_html"

+ preprocess="true"

+ allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_BROWSER_PROXY_JS"

+ file="google_assistant_page/google_assistant_browser_proxy.js"

+ type="chrome_html"

+ preprocess="true"

+ allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_BROWSER_PROXY_HTML"

+ file="google_assistant_page/google_assistant_browser_proxy.html"

+ type="chrome_html"

+ preprocess="true"

+ allowexternalscript="true" />

+ </if>

<structure name="IDR_SETTINGS_SEARCH_PAGE_JS"

file="search_page/search_page.js"

type="chrome_html" />