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

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

Issue 2146553005: MD Settings: Bluetooth: Add error dialog and messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_602538_bluetooth_fixes_0
Patch Set: Feedback 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
index 18243c3f2caccd4e0ad19239957694946cdf24e7..4723b88d61f5ac1c92bb50ad90ebbcaef0a1c4d6 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.html
@@ -14,10 +14,6 @@
<dom-module id="bluetooth-device-dialog">
<template>
<style include="settings-shared">
- #dialogMessage {
- margin-bottom: 10px;
- }
-
#pairing {
margin-bottom: 10px;
}
@@ -40,6 +36,10 @@
width: 20px;
}
+ .dialog-message {
+ margin-bottom: 10px;
+ }
+
/* .display indicates a displayed pin code or passkey. */
span.display {
border: 1px solid #ccc;
@@ -99,7 +99,7 @@
<template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]">
<div id="pairing" class="settings-box first layout vertical center
center-justified">
- <div id="dialogMessage">
+ <div class="dialog-message">
[[getMessage_(pairingDevice, pairingEvent)]]
</div>
<div hidden$="[[!showEnterPincode_(pairingEvent)]]">
@@ -125,6 +125,12 @@
</div>
</div>
</template>
+ <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]">
+ <div class="settings-box first layout vertical center
+ center-justified">
+ <div class="dialog-message">[[errorMessage]]</div>
+ </div>
+ </template>
</div>
<div class="button-container">
<template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]">
@@ -153,6 +159,10 @@
$i18n{cancel}
</paper-button>
</template>
+ <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]">
+ <paper-button on-tap="onDismissTap_">$i18n{bluetoothDismiss}
+ </paper-button>
+ </template>
</div>
</cr-dialog>
</template>
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | 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