From 095a49b96601478ec8cb0a607e5d7bf4b4cc9dd0 Mon Sep 17 00:00:00 2001
From: dpapad <dpapad@chromium.org>
Date: Tue, 1 May 2018 17:02:04 +0000
Subject: [PATCH] WebUI MD Refresh: Apply shared button styles to bluetooth
 dialog.

Previously the buttons were using default Polymer style, which is different than
WebUI style. Also in this CL, moving the "Cancel" button to the left, since this
is matching every other dialog in Settings.

Bug: 838427
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I77c61b3d0701ba0512e87615a0cf7f8bc0f77766
Reviewed-on: https://chromium-review.googlesource.com/1036602
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555079}
---
 .../chromeos/bluetooth_dialog.html            | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html b/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html
index e42cfe1e2b1cce..2bbeebf2e23285 100644
--- a/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html
+++ b/ui/webui/resources/cr_components/chromeos/bluetooth_dialog.html
@@ -2,6 +2,7 @@
 
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
+<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
 <link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
@@ -11,7 +12,7 @@
 
 <dom-module id="bluetooth-dialog">
   <template>
-    <style include="cr-hidden-style iron-flex">
+    <style include="cr-hidden-style paper-button-style iron-flex">
       cr-dialog {
         --cr-dialog-native: var(--bluetooth-dialog-style);
       }
@@ -117,19 +118,27 @@
       </div>
       <div slot="button-container">
         <template is="dom-if" if="[[!errorMessage_]]">
+          <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent_)]]"
+              class="cancel-button" on-tap="onCancelTap_">
+           [[i18n('cancel')]]
+          </paper-button>
           <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
-              on-tap="onAcceptTap_">[[i18n('bluetoothAccept')]]</paper-button>
+              class="action-button" on-tap="onAcceptTap_">
+            [[i18n('bluetoothAccept')]]
+          </paper-button>
           <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
-              on-tap="onRejectTap_">[[i18n('bluetoothReject')]]</paper-button>
+              class="action-button" on-tap="onRejectTap_">
+            [[i18n('bluetoothReject')]]
+          </paper-button>
           <paper-button hidden$="[[!showConnect_(pairingEvent_)]]"
               disabled="[[!enableConnect_(pairingEvent_, pinOrPass_)]]"
-              on-tap="onConnectTap_">[[i18n('bluetoothPair')]]</paper-button>
+              class="action-button" on-tap="onConnectTap_">
+            [[i18n('bluetoothPair')]]
+          </paper-button>
           <paper-button
               hidden$="[[!showDismiss_(pairingDevice, pairingEvent_)]]"
-              on-tap="close">[[i18n('ok')]]</paper-button>
-          <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent_)]]"
-              on-tap="onCancelTap_">
-           [[i18n('cancel')]]
+              class="action-button" on-tap="close">
+            [[i18n('ok')]]
           </paper-button>
         </template>
         <template is="dom-if" if="[[errorMessage_]]">