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

Side by Side Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html

Issue 2161753002: MD Settings: Bluetooth dialog, remove unnecessary 'close-dialog' event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/html/cr.html"> 2 <link rel="import" href="chrome://resources/html/cr.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html"> 10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html">
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 /* .confirm indicates a confirmation passkey. */ 71 /* .confirm indicates a confirmation passkey. */
72 span.confirm { 72 span.confirm {
73 color: #999; 73 color: #999;
74 font-size: 20px; 74 font-size: 20px;
75 font-weight: 600; /* semibold */ 75 font-weight: 600; /* semibold */
76 margin: 0 20px; 76 margin: 0 20px;
77 } 77 }
78 </style> 78 </style>
79 <cr-dialog id="dialog" class="layout vertical" 79 <cr-dialog id="dialog" class="layout vertical"
80 on-iron-overlay-canceled="onIronOverlayCanceled_" 80 on-iron-overlay-canceled="onIronOverlayCanceled_">
81 on-iron-overlay-closed="onIronOverlayClosed_">
82 <div class="title">[[getTitle_(dialogId)]]</div> 81 <div class="title">[[getTitle_(dialogId)]]</div>
83 <div class="body"> 82 <div class="body">
84 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]"> 83 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]">
85 <div id="dialogDeviceList" class="layout vertical" 84 <div id="dialogDeviceList" class="layout vertical"
86 on-device-event="onDeviceEvent_"> 85 on-device-event="onDeviceEvent_">
87 <span class="no-devices" hidden$="[[haveDevices_(deviceList)]]"> 86 <span class="no-devices" hidden$="[[haveDevices_(deviceList)]]">
88 $i18n{bluetoothNoDevices} 87 $i18n{bluetoothNoDevices}
89 </span> 88 </span>
90 <iron-selector class="flex"> 89 <iron-selector class="flex">
91 <template is="dom-repeat" items="[[deviceList]]" 90 <template is="dom-repeat" items="[[deviceList]]"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 </template> 145 </template>
147 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]"> 146 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]">
148 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]" 147 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"
149 on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button> 148 on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button>
150 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]" 149 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]"
151 on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button> 150 on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button>
152 <paper-button hidden$="[[!showConnect_(pairingEvent)]]" 151 <paper-button hidden$="[[!showConnect_(pairingEvent)]]"
153 disabled="[[!enableConnect_(pairingEvent, pinOrPass)]]" 152 disabled="[[!enableConnect_(pairingEvent, pinOrPass)]]"
154 on-tap="onConnectTap_">$i18n{bluetoothConnect}</paper-button> 153 on-tap="onConnectTap_">$i18n{bluetoothConnect}</paper-button>
155 <paper-button hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]" 154 <paper-button hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]"
156 on-tap="onDismissTap_">$i18n{bluetoothDismiss}</paper-button> 155 on-tap="close">$i18n{bluetoothDismiss}</paper-button>
157 <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]" 156 <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]"
158 on-tap="onCancelTap_"> 157 on-tap="onCancelTap_">
159 $i18n{cancel} 158 $i18n{cancel}
160 </paper-button> 159 </paper-button>
161 </template> 160 </template>
162 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]"> 161 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]">
163 <paper-button on-tap="onDismissTap_">$i18n{bluetoothDismiss} 162 <paper-button on-tap="close">$i18n{bluetoothDismiss}
164 </paper-button> 163 </paper-button>
165 </template> 164 </template>
166 </div> 165 </div>
167 </cr-dialog> 166 </cr-dialog>
168 </template> 167 </template>
169 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script> 168 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script>
170 </dom-module> 169 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698