| Index: chrome/browser/resources/settings/people_page/import_data_dialog.html
|
| diff --git a/chrome/browser/resources/settings/people_page/import_data_dialog.html b/chrome/browser/resources/settings/people_page/import_data_dialog.html
|
| index 57a58568b7e90862a6bd5d195767edea8cd17e34..de60e6f311e5493b0a8522c9b6ad52f52e1b0c0b 100644
|
| --- a/chrome/browser/resources/settings/people_page/import_data_dialog.html
|
| +++ b/chrome/browser/resources/settings/people_page/import_data_dialog.html
|
| @@ -2,33 +2,65 @@
|
| <link rel="import" href="chrome://resources/html/i18n_behavior.html">
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.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-spinner/paper-spinner.html">
|
| <link rel="import" href="/controls/settings_checkbox.html">
|
| +<link rel="import" href="/controls/settings_toggle_button.html">
|
| +<link rel="import" href="/i18n_setup.html">
|
| +<link rel="import" href="/icons.html">
|
| <link rel="import" href="/md_select_css.html">
|
| <link rel="import" href="/people_page/import_data_browser_proxy.html">
|
| +<link rel="import" href="/prefs/prefs_behavior.html">
|
|
|
| <dom-module id="settings-import-data-dialog">
|
| <template>
|
| <style include="settings-shared md-select">
|
| - #description {
|
| + .description {
|
| align-items: center;
|
| display: flex;
|
| min-height: var(--settings-row-min-height);
|
| }
|
| +
|
| + paper-spinner {
|
| + margin: 0 8px;
|
| + }
|
| +
|
| + #success-icon {
|
| + fill: var(--paper-blue-600);
|
| + height: 80px;
|
| + margin: auto;
|
| + width: 100%;
|
| + }
|
| </style>
|
| <dialog is="cr-dialog" id="dialog">
|
| <div class="title">$i18n{importTitle}</div>
|
| <div class="body">
|
| - <span class="md-select-wrapper">
|
| - <select id="browserSelect" class="md-select" on-change="onChange_">
|
| - <template is="dom-repeat" items="[[browserProfiles_]]">
|
| - <option value="[[item.index]]">[[item.name]]</option>
|
| - </template>
|
| - </select>
|
| - <span class="md-select-underline"></span>
|
| - </span>
|
| - <div id="description">$i18n{importDescription}</div>
|
| - <div>
|
| + <div hidden$="[[!hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]">
|
| + <iron-icon id="success-icon" icon="settings:check-circle">
|
| + </iron-icon>
|
| + <div hidden$="[[!prefs.import_bookmarks.value]]">
|
| + <div class="description">$i18n{importSuccess}</div>
|
| + <settings-toggle-button class="start"
|
| + label="$i18n{showBookmarksBar}"
|
| + pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
|
| + </settings-toggle-button>
|
| + </div>
|
| + </div>
|
| +
|
| + <div hidden$="[[hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]">
|
| + <span class="md-select-wrapper">
|
| + <select id="browserSelect" class="md-select"
|
| + on-change="onBrowserProfileSelectionChange_">
|
| + <template is="dom-repeat" items="[[browserProfiles_]]">
|
| + <option value="[[item.index]]">[[item.name]]</option>
|
| + </template>
|
| + </select>
|
| + <span class="md-select-underline"></span>
|
| + </span>
|
| + <div class="description">$i18n{importDescription}</div>
|
| <settings-checkbox
|
| hidden="[[!selected_.history]]"
|
| pref="{{prefs.import_history}}"
|
| @@ -57,15 +89,33 @@
|
| </div>
|
| </div>
|
| <div class="button-container">
|
| - <div class="action-buttons">
|
| - <paper-button class="cancel-button" id="cancel" on-tap="onCancelTap_">
|
| - $i18n{cancel}
|
| - </paper-button>
|
| - <paper-button id="actionButton" class="action-button"
|
| - on-tap="onActionButtonTap_">
|
| - [[getActionButtonText_(selected_)]]
|
| - </paper-button>
|
| - </div>
|
| + <paper-spinner
|
| + active="[[hasImportStatus_(
|
| + importStatusEnum_.IN_PROGRESS, importStatus_)]]"
|
| + hidden="[[hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]">
|
| + </paper-spinner>
|
| + <paper-button class="cancel-button" id="cancel"
|
| + hidden="[[hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]"
|
| + disabled="[[hasImportStatus_(
|
| + importStatusEnum_.IN_PROGRESS, importStatus_)]]"
|
| + on-tap="closeDialog_">
|
| + $i18n{cancel}
|
| + </paper-button>
|
| + <paper-button class="action-button"
|
| + hidden="[[hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]"
|
| + disabled="[[shouldDisableImport_(
|
| + importStatus_, noImportDataTypeSelected_)]]"
|
| + on-tap="onActionButtonTap_">
|
| + [[getActionButtonText_(selected_)]]
|
| + </paper-button>
|
| +
|
| + <paper-button class="action-button"
|
| + hidden$="[[!hasImportStatus_(
|
| + importStatusEnum_.SUCCEEDED, importStatus_)]]"
|
| + on-tap="closeDialog_">$i18n{done}</paper-button>
|
| </div>
|
| </dialog>
|
| </template>
|
|
|