chrome/browser/resources/settings/settings_resources.grd - Issue 1954383002: MD Settings: combine bluetooth adding and pairing dialogs into one

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 1954383002: MD Settings: combine bluetooth adding and pairing dialogs into one (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: whoops, html deps Created 4 years, 7 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/bluetooth_page/compiled_resources2.gyp ('k') | chrome/test/data/webui/settings/bluetooth_page_browsertest_chromeos.js » ('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 5dd31817a292734fbbf132753a65405375879b5d..6875fc85d839313a29a7937efb92af6907ca7209 100644

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

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

@@ -742,6 +742,12 @@

file="site_settings/website_usage_private_api.js"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"

+ file="bluetooth_page/bluetooth_device_dialog.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_JS"

+ file="bluetooth_page/bluetooth_device_dialog.js"

+ type="chrome_html" />

<structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML"

file="bluetooth_page/bluetooth_device_list_item.html"

type="chrome_html" />

@@ -757,18 +763,6 @@

<structure name="IDR_SETTINGS_BLUETOOTH_PAGE_JS"

file="bluetooth_page/bluetooth_page.js"

type="chrome_html" />

- <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_HTML"

- file="bluetooth_page/bluetooth_add_device_dialog.html"

- type="chrome_html" />

- <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_JS"

- file="bluetooth_page/bluetooth_add_device_dialog.js"

- type="chrome_html" />

- <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_HTML"

- file="bluetooth_page/bluetooth_pair_device_dialog.html"

- type="chrome_html" />

- <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_JS"

- file="bluetooth_page/bluetooth_pair_device_dialog.js"

- type="chrome_html" />

<structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"

file="date_time_page/date_time_page.html"

type="chrome_html" />