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

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

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.js
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.js b/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.js
deleted file mode 100644
index e31d5a42835309871069941f5906038e87ac1f74..0000000000000000000000000000000000000000
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_pair_device_dialog.js
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview
- * 'settings-bluetooth-pair-device-dialog' is the settings dialog for pairing
- * a bluetooth device.
- */
-
-(function() {
-
-var PairingEventType = chrome.bluetoothPrivate.PairingEventType;
-
-Polymer({
- is: 'settings-bluetooth-pair-device-dialog',
-
- behaviors: [I18nBehavior],
-
- properties: {
- /**
- * Current Pairing device.
- * @type {?chrome.bluetooth.Device|undefined}
- */
- pairingDevice: Object,
-
- /**
- * Current Pairing event.
- * @type {?chrome.bluetoothPrivate.PairingEvent|undefined}
- */
- pairingEvent: Object,
-
- /**
- * @const
- * @type {!Array<number>}
- */
- digits: {
- type: Array,
- readOnly: true,
- value: [0, 1, 2, 3, 4, 5],
- },
- },
-
- observers: [
- 'pairingChanged_(pairingDevice, pairingEvent)',
- ],
-
- /**
- * @param {?chrome.bluetooth.Device} pairingDevice
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @private
- */
- pairingChanged_: function(pairingDevice, pairingEvent) {
- // Auto-close the dialog when pairing completes.
- if (pairingDevice && pairingDevice.connected) {
- this.fire('close-dialog', '');
- return;
- }
- },
-
- /**
- * @param {?chrome.bluetooth.Device} device
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {string}
- * @private
- */
- getMessage_: function(device, pairingEvent) {
- if (!device)
- return '';
- var message;
- if (!pairingEvent)
- message = 'bluetoothStartConnecting';
- else
- message = this.getEventDesc_(pairingEvent.pairing);
- return this.i18n(message, device.name);
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showEnterPincode_: function(pairingEvent) {
- return !!pairingEvent &&
- pairingEvent.pairing == PairingEventType.REQUEST_PINCODE;
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showEnterPasskey_: function(pairingEvent) {
- return !!pairingEvent &&
- pairingEvent.pairing == PairingEventType.REQUEST_PASSKEY;
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showDisplayPassOrPin_: function(pairingEvent) {
- if (!pairingEvent)
- return false;
- var pairing = pairingEvent.pairing;
- return (
- pairing == PairingEventType.DISPLAY_PINCODE ||
- pairing == PairingEventType.DISPLAY_PASSKEY ||
- pairing == PairingEventType.CONFIRM_PASSKEY ||
- pairing == PairingEventType.KEYS_ENTERED);
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showAcceptReject_: function(pairingEvent) {
- return !!pairingEvent &&
- pairingEvent.pairing == PairingEventType.CONFIRM_PASSKEY;
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showConnect_: function(pairingEvent) {
- if (!pairingEvent)
- return false;
- var pairing = pairingEvent.pairing;
- if (pairing == PairingEventType.REQUEST_PINCODE) {
- var pincode = /** @type {{invalid: boolean}} */(this.$.pincode);
- return !pincode.invalid;
- } else if (pairing == PairingEventType.REQUEST_PASSKEY) {
- var passkey = /** @type {{invalid: boolean}} */(this.$.passkey);
- return !passkey.invalid;
- }
- return false;
- },
-
- /**
- * @param {?chrome.bluetooth.Device} device
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @return {boolean}
- * @private
- */
- showDismiss_: function(device, pairingEvent) {
- return (!!device && device.paired) ||
- (!!pairingEvent && pairingEvent.pairing == PairingEventType.COMPLETE);
- },
-
- /** @private */
- onAcceptTap_: function() {
- this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CONFIRM);
- },
-
- /** @private */
- onConnectTap_: function() {
- this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CONFIRM);
- },
-
- /** @private */
- onRejectTap_: function() {
- this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.REJECT);
- },
-
- /** @private */
- onCancelTap_: function() {
- this.sendResponse_(chrome.bluetoothPrivate.PairingResponse.CANCEL);
- // Close the dialog immediately.
- this.fire('close-dialog', '');
- },
-
- /** @private */
- onDismissTap_: function() { this.fire('close-dialog', ''); },
-
- /** @private */
- sendResponse_: function(response) {
- if (!this.pairingDevice)
- return;
- var options =
- /** @type {!chrome.bluetoothPrivate.SetPairingResponseOptions} */ {
- device: this.pairingDevice,
- response: response
- };
- if (response == chrome.bluetoothPrivate.PairingResponse.CONFIRM) {
- var pairing = this.pairingEvent.pairing;
- if (pairing == PairingEventType.REQUEST_PINCODE)
- options.pincode = this.$.pincode.value;
- else if (pairing == PairingEventType.REQUEST_PASSKEY)
- options.passkey = parseInt(this.$.passkey.value, 10);
- }
- this.fire('response', options);
- },
-
- /**
- * @param {!PairingEventType} eventType
- * @return {string}
- * @private
- */
- getEventDesc_: function(eventType) {
- assert(eventType);
- if (eventType == PairingEventType.COMPLETE ||
- eventType == PairingEventType.KEYS_ENTERED ||
- eventType == PairingEventType.REQUEST_AUTHORIZATION) {
- return 'bluetoothStartConnecting';
- }
- return 'bluetooth_' + /** @type {string} */(eventType);
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @param {number} index
- * @return {string}
- * @private
- */
- getPinDigit_: function(pairingEvent, index) {
- if (!pairingEvent)
- return '';
- var digit = '0';
- var pairing = pairingEvent.pairing;
- if (pairing == PairingEventType.DISPLAY_PINCODE && pairingEvent.pincode &&
- index < pairingEvent.pincode.length) {
- digit = pairingEvent.pincode[index];
- } else if (pairingEvent.passkey &&
- (pairing == PairingEventType.DISPLAY_PASSKEY ||
- pairing == PairingEventType.KEYS_ENTERED ||
- pairing == PairingEventType.CONFIRM_PASSKEY)) {
- var passkeyString = String(pairingEvent.passkey);
- if (index < passkeyString.length)
- digit = passkeyString[index];
- }
- return digit;
- },
-
- /**
- * @param {?chrome.bluetoothPrivate.PairingEvent} pairingEvent
- * @param {number} index
- * @return {string}
- * @private
- */
- getPinClass_: function(pairingEvent, index) {
- if (!pairingEvent)
- return '';
- if (pairingEvent.pairing == PairingEventType.CONFIRM_PASSKEY)
- return 'confirm';
- var cssClass = 'display';
- if (pairingEvent.pairing == PairingEventType.DISPLAY_PASSKEY) {
- if (index == 0)
- cssClass += ' next';
- else
- cssClass += ' untyped';
- } else if (
- pairingEvent.pairing == PairingEventType.KEYS_ENTERED &&
- pairingEvent.enteredKey) {
- var enteredKey = pairingEvent.enteredKey; // 1-7
- var lastKey = this.digits.length; // 6
- if ((index == -1 && enteredKey > lastKey) || (index + 1 == enteredKey))
- cssClass += ' next';
- else if (index > enteredKey)
- cssClass += ' untyped';
- }
- return cssClass;
- },
-});
-})();

Powered by Google App Engine
This is Rietveld 408576698