| Index: chrome/browser/resources/chromeos/emulator/audio_settings.html
|
| diff --git a/chrome/browser/resources/chromeos/emulator/audio_settings.html b/chrome/browser/resources/chromeos/emulator/audio_settings.html
|
| index b771705296d57c06beee7ed435c2f663a3eb5ab7..207c70ec6ce83a2f83d8d5927274ad4ea8910459 100644
|
| --- a/chrome/browser/resources/chromeos/emulator/audio_settings.html
|
| +++ b/chrome/browser/resources/chromeos/emulator/audio_settings.html
|
| @@ -1,17 +1,23 @@
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
|
| +<link rel="import" href="chrome://resources/html/polymer.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/paper-radio-button.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">
|
| +<link rel="import" href="icons.html">
|
| +<link rel="import" href="shared_styles.html">
|
|
|
| <dom-module id="audio-settings">
|
| - <link rel="import" type="css" href="shared_styles.css">
|
| <template>
|
| - <paper-dialog on-iron-overlay-opened="editDialogOpened" modal
|
| - id="editModal">
|
| + <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
|
| + See https://github.com/Polymer/polymer/pull/3668. -->
|
| + <style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
|
| + </style>
|
| + <paper-dialog with-backdrop id="editDialog">
|
| <div class="element-label">[[currentEditableObject.deviceName]]</div>
|
| <div>
|
| <form>
|
| @@ -39,8 +45,9 @@
|
| selected="{{currentEditableObject.type}}">
|
| <template is="dom-repeat"
|
| items="[[nodeTypeOptions]]" as="option">
|
| - <paper-radio-button name="[[option.type]]"
|
| - >[[option.name]]</paper-radio-button>
|
| + <paper-radio-button name="[[option.type]]">
|
| + [[option.name]]
|
| + </paper-radio-button>
|
| </template>
|
| </paper-radio-group>
|
| </div>
|
| @@ -54,8 +61,8 @@
|
|
|
| <div class="layout vertical">
|
| <div class="element-label">
|
| - <paper-icon-button icon="av:volume-up"></paper-icon-button>
|
| - <span>[[title]]</span>
|
| + <paper-icon-button icon="device-emulator:volume-up"></paper-icon-button>
|
| + Audio
|
| </div>
|
| <table class="devices-table">
|
| <tbody>
|
| @@ -68,12 +75,15 @@
|
| <tr>
|
| <td class="alias-cell">[[item.deviceName]]</td>
|
| <td class="icon-cell">
|
| - <paper-icon-button icon="content-copy" data-predefined="false"
|
| - on-click="copyDevice"></paper-icon-button>
|
| - <paper-icon-button icon="settings" on-click="showEditModal"
|
| - ></paper-icon-button>
|
| - <paper-icon-button icon="delete" on-click="removeAudioNode"
|
| - ></paper-icon-button>
|
| + <paper-icon-button icon="device-emulator:content-copy"
|
| + data-predefined="false" on-click="copyDevice">
|
| + </paper-icon-button>
|
| + <paper-icon-button icon="device-emulator:settings"
|
| + on-click="showEditDialog">
|
| + </paper-icon-button>
|
| + <paper-icon-button icon="device-emulator:delete"
|
| + on-click="removeAudioNode">
|
| + </paper-icon-button>
|
| </td>
|
| <td class="control-cell">
|
| <paper-checkbox checked="{{item.isInput}}"
|
|
|