| Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| index f7759a30296b1fc8e6f43f4cfea0a2cda814dd07..8fbd23ce5d1500b718d8be80c41649f92aa6ad75 100644
|
| --- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| +++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
|
| @@ -42,16 +42,6 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * Set by bluetooth-subpage to controll spinner visibilit in the header.
|
| - * @private
|
| - */
|
| - showSpinner_: {
|
| - type: Boolean,
|
| - notify: true,
|
| - value: false,
|
| - },
|
| -
|
| - /**
|
| * The cached bluetooth adapter state.
|
| * @type {!chrome.bluetooth.AdapterState|undefined}
|
| * @private
|
| @@ -132,7 +122,7 @@ Polymer({
|
| * @return {string}
|
| * @private
|
| */
|
| - getTitle_: function() {
|
| + getDescription_: function() {
|
| return this.i18n(
|
| this.bluetoothEnabled_ ? 'bluetoothEnabled' : 'bluetoothDisabled');
|
| },
|
| @@ -161,6 +151,14 @@ Polymer({
|
| * @param {Event} e
|
| * @private
|
| */
|
| + stopTap_: function(e) {
|
| + e.stopPropagation();
|
| + },
|
| +
|
| + /**
|
| + * @param {Event} e
|
| + * @private
|
| + */
|
| onSubpageArrowTap_: function(e) {
|
| this.openSubpage_();
|
| e.stopPropagation();
|
|
|