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

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

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
Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.html
deleted file mode 100644
index fcfa8525ec4132d1a46f154881bba7d53cc1a588..0000000000000000000000000000000000000000
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
-<link rel="import" href="chrome://md-settings/bluetooth_page/bluetooth_dialog_shared_css.html">
-<link rel="import" href="chrome://md-settings/icons.html">
-<link rel="import" href="chrome://md-settings/settings_shared_css.html">
-
-<dom-module id="settings-bluetooth-pair-device-dialog">
- <template>
- <style include="settings-shared"></style>
- <style include="bluetooth-dialog-shared"></style>
- <div id="dialogOuterDiv" class="layout vertical flex">
- <div id="dialogHeaderDiv" class="settings-box layout horizontal center">
- <span id="dialogTitle" class="flex"
- i18n-content="bluetoothPairDevicePageTitle">
- </span>
- <paper-icon-button id="close" icon="settings:close"
- on-tap="onCancelTap_">
- </paper-icon-button>
- </div>
- <div id="pairing"
- class="settings-blox layout vertical center center-justified flex">
- <div id="dialogMessage">
- [[getMessage_(pairingDevice, pairingEvent)]]
- </div>
- <div hidden$="[[!showEnterPincode_(pairingEvent)]]">
- <paper-input id="pincode" minlength="1" maxlength="16" type="text">
- </div>
- <div hidden$="[[!showEnterPasskey_(pairingEvent)]]">
- <paper-input id="passkey" minlength="6" maxlength="6" type="text">
- </div>
- <div id="pinDiv" class="layout horizontal center center-justified"
- hidden="[[!showDisplayPassOrPin_(pairingEvent)]]">
- <template is="dom-repeat" items="[[digits]]">
- <span class$="[[getPinClass_(pairingEvent, index)]]">
- [[getPinDigit_(pairingEvent, index)]]
- </span>
- </template>
- <span class$="[[getPinClass_(pairingEvent, -1)]]"
- hidden="[[showAcceptReject_(pairingEvent)]]">
- [[i18n('bluetoothEnterKey')]]
- </span>
- </div>
- </div>
- <div id="dialogFooterDiv" class="layout horizontal center end-justified">
- <paper-button i18n-content="bluetoothAccept"
- hidden$="[[!showAcceptReject_(pairingEvent)]]"
- on-tap="onAcceptTap_">
- </paper-button>
- <paper-button i18n-content="bluetoothReject"
- hidden$="[[!showAcceptReject_(pairingEvent)]]"
- on-tap="onRejectTap_">
- </paper-button>
- <paper-button i18n-content="bluetoothConnect"
- hidden$="[[!showConnect_(pairingEvent)]]"
- on-tap="onConnectTap_">
- </paper-button>
- <paper-button i18n-content="bluetoothDismiss"
- hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]"
- on-tap="onDismissTap_">
- </paper-button>
- <paper-button i18n-content="cancel" on-tap="onCancelTap_"
- hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]">
- </paper-button>
- </div>
- </div>
- </template>
- <script src="bluetooth_pair_device_dialog.js"></script>
-</dom-module>

Powered by Google App Engine
This is Rietveld 408576698