Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
| 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 | 32 |
| 33 settings-bluetooth-add-device-dialog, | 33 settings-bluetooth-add-device-dialog, |
| 34 settings-bluetooth-pair-device-dialog { | 34 settings-bluetooth-pair-device-dialog { |
| 35 height: 400px; | 35 height: 400px; |
| 36 padding: 0; | 36 padding: 0; |
| 37 width: 500px; | 37 width: 500px; |
| 38 } | 38 } |
| 39 </style> | 39 </style> |
| 40 <settings-animated-pages id="pages" section="bluetooth"> | 40 <settings-animated-pages id="pages" section="bluetooth"> |
| 41 <neon-animatable route-path="default"> | 41 <neon-animatable route-path="default"> |
| 42 <div class="settings-box first" | 42 <div class="settings-box first" actionable |
| 43 on-tap="toggleDeviceListExpanded_"> | 43 on-tap="toggleDeviceListExpanded_"> |
| 44 <iron-icon icon="settings:bluetooth"></iron-icon> | 44 <div class="start layout horizontal"> |
| 45 <span class="middle">$i18n{bluetoothEnable}</span> | 45 <iron-icon icon="settings:bluetooth"></iron-icon> |
| 46 <cr-expand-button id="expandListButton" | 46 <span class="middle flex">$i18n{bluetoothEnable}</span> |
|
dschuyler
2016/12/13 00:48:01
I suspect that line 44 and 56 could be deleted, al
stevenjb
2016/12/13 19:07:45
Done.
| |
| 47 alt="$i18n{bluetoothExpandA11yLabel}" | 47 <cr-policy-pref-indicator |
| 48 hidden$="[[!bluetoothEnabled_]]" | 48 pref="[[prefs.cros.device.allow_bluetooth]]" |
| 49 expanded="{{deviceListExpanded_}}"> | 49 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> |
| 50 </cr-expand-button> | 50 </cr-policy-pref-indicator> |
| 51 <paper-toggle-button id="enableBluetooth" | 51 <cr-expand-button id="expandListButton" |
| 52 checked="{{bluetoothEnabled_}}" | 52 alt="$i18n{bluetoothExpandA11yLabel}" |
| 53 disabled="[[!adapterState_.available]]" | 53 hidden$="[[!bluetoothEnabled_]]" |
| 54 on-change="onBluetoothEnabledChange_"> | 54 expanded="{{deviceListExpanded_}}"> |
| 55 </paper-toggle-button> | 55 </cr-expand-button> |
| 56 <cr-policy-pref-indicator | 56 </div> |
| 57 pref="[[prefs.cros.device.allow_bluetooth]]" | 57 <div class="secondary-action"> |
| 58 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> | 58 <paper-toggle-button id="enableBluetooth" |
| 59 </cr-policy-pref-indicator> | 59 checked="{{bluetoothEnabled_}}" |
| 60 disabled="[[!adapterState_.available]]" | |
| 61 on-change="onBluetoothEnabledChange_" | |
| 62 on-tap="doNothing_"> | |
| 63 </paper-toggle-button> | |
| 64 </div> | |
| 60 </div> | 65 </div> |
| 61 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled_, | 66 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled_, |
| 62 deviceListExpanded_)]]"> | 67 deviceListExpanded_)]]"> |
| 63 <div id="deviceList" class="list-frame vertical-list" | 68 <div id="deviceList" class="list-frame vertical-list" |
| 64 on-device-event="onDeviceEvent_"> | 69 on-device-event="onDeviceEvent_"> |
| 65 <div id="container" class="layout vertical" scrollable> | 70 <div id="container" class="layout vertical" scrollable> |
| 66 <iron-list items="[[getPairedOrConnecting_(deviceList_.*)]]" | 71 <iron-list items="[[getPairedOrConnecting_(deviceList_.*)]]" |
| 67 selection-enabled selected-item="{{selectedItem_}}" | 72 selection-enabled selected-item="{{selectedItem_}}" |
| 68 scroll-target="container"> | 73 scroll-target="container"> |
| 69 <template> | 74 <template> |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 97 on-device-event="onDeviceEvent_" | 102 on-device-event="onDeviceEvent_" |
| 98 on-response="onResponse_" | 103 on-response="onResponse_" |
| 99 pairing-device="[[pairingDevice_]]" | 104 pairing-device="[[pairingDevice_]]" |
| 100 pairing-event="[[pairingEvent_]]"> | 105 pairing-event="[[pairingEvent_]]"> |
| 101 </bluetooth-device-dialog> | 106 </bluetooth-device-dialog> |
| 102 </template> | 107 </template> |
| 103 | 108 |
| 104 </template> | 109 </template> |
| 105 <script src="bluetooth_page.js"></script> | 110 <script src="bluetooth_page.js"></script> |
| 106 </dom-module> | 111 </dom-module> |
| OLD | NEW |