chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp - 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/bluetooth_page/compiled_resources2.gyp

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/bluetooth_pair_device_dialog.js ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp

diff --git a/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp b/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp

index 3cbd221727d440a5564760c6c7f24b7ebcba0950..dca7922cc3f63d7f5272114bcdd3ce5ac1d643c5 100644

--- a/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp

+++ b/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp

@@ -16,26 +16,20 @@

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'bluetooth_device_list_item',

- 'dependencies': [

- '<(EXTERNS_GYP):bluetooth',

- ],

- 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

- },

- {

- 'target_name': 'bluetooth_add_device_dialog',

+ 'target_name': 'bluetooth_device_dialog',

'dependencies': [

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',

'<(EXTERNS_GYP):bluetooth',

+ '<(EXTERNS_GYP):bluetooth_private',

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'bluetooth_pair_device_dialog',

+ 'target_name': 'bluetooth_device_list_item',

'dependencies': [

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',

'<(EXTERNS_GYP):bluetooth',

- '<(EXTERNS_GYP):bluetooth_private',

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],