Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5475)

Unified Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html

Issue 2655043005: MD Settings: Bluetooth: Move device list to subpage (Closed)
Patch Set: Fix clang, ES6 Created 3 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
Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
index b4a00c2a93460098e566861fffd1d5c23a65f435..94f0df2c9bb07c9856f26b87d139a73d19c48eae 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
@@ -74,7 +74,8 @@
margin: 0 20px;
}
</style>
- <dialog is="cr-dialog" id="dialog" on-cancel="onDialogCanceled_">
+ <dialog is="cr-dialog" id="dialog" on-cancel="onDialogCanceled_"
+ on-closed="onDialogCanceled_">
<div class="title">$i18n{bluetoothPairDevicePageTitle}</div>
<div class="body">
<div class="contents layout vertical center center-justified">
@@ -103,27 +104,27 @@
<div id="pairing" class="settings-box first layout vertical center
center-justified">
<div class="dialog-message">
- [[getMessage_(pairingDevice, pairingEvent)]]
+ [[getMessage_(pairingDevice, pairingEvent_)]]
</div>
- <div hidden$="[[!showEnterPincode_(pairingEvent)]]">
+ <div hidden$="[[!showEnterPincode_(pairingEvent_)]]">
<paper-input id="pincode" minlength="1" maxlength="16"
type="text" auto-validate value="{{pinOrPass}}">
</paper-input>
</div>
- <div hidden$="[[!showEnterPasskey_(pairingEvent)]]">
+ <div hidden$="[[!showEnterPasskey_(pairingEvent_)]]">
<paper-input id="passkey" minlength="6" maxlength="6"
type="text" auto-validate value="{{pinOrPass}}">
</paper-input>
</div>
<div id="pinDiv" class="layout horizontal center center-justified"
- hidden="[[!showDisplayPassOrPin_(pairingEvent)]]">
+ hidden="[[!showDisplayPassOrPin_(pairingEvent_)]]">
<template is="dom-repeat" items="[[digits]]">
- <span class$="[[getPinClass_(index, pairingEvent)]]">
- [[getPinDigit_(index, pairingEvent)]]
+ <span class$="[[getPinClass_(index, pairingEvent_)]]">
+ [[getPinDigit_(index, pairingEvent_)]]
</span>
</template>
- <span class$="[[getPinClass_(-1, pairingEvent)]]"
- hidden="[[showAcceptReject_(pairingEvent)]]">
+ <span class$="[[getPinClass_(-1, pairingEvent_)]]"
+ hidden="[[showAcceptReject_(pairingEvent_)]]">
$i18n{bluetoothEnterKey}
</span>
</div>
@@ -151,16 +152,17 @@
</paper-button>
</template>
<template is="dom-if" if="[[isDialogType_('pairDevice', dialogId)]]">
- <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"
+ <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button>
- <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"
+ <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button>
- <paper-button hidden$="[[!showConnect_(pairingEvent)]]"
- disabled="[[!enableConnect_(pairingEvent, pinOrPass)]]"
+ <paper-button hidden$="[[!showConnect_(pairingEvent_)]]"
+ disabled="[[!enableConnect_(pairingEvent_, pinOrPass)]]"
on-tap="onConnectTap_">$i18n{bluetoothPair}</paper-button>
- <paper-button hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]"
+ <paper-button
+ hidden$="[[!showDismiss_(pairingDevice, pairingEvent_)]]"
on-tap="close">$i18n{bluetoothDismiss}</paper-button>
- <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]"
+ <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent_)]]"
on-tap="onCancelTap_">
$i18n{cancel}
</paper-button>

Powered by Google App Engine
This is Rietveld 408576698