Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 3 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 7 <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-button/paper-butt on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 9 <link rel="import" href="../controls/settings_checkbox.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 11 <link rel="import" href="../i18n_setup.html"> | 11 <link rel="import" href="../i18n_setup.html"> |
| 12 <link rel="import" href="../icons.html"> | 12 <link rel="import" href="../icons.html"> |
| 13 <link rel="import" href="import_data_browser_proxy.html"> | 13 <link rel="import" href="import_data_browser_proxy.html"> |
| 14 <link rel="import" href="../prefs/prefs_behavior.html"> | |
| 15 <link rel="import" href="../settings_vars_css.html"> | 14 <link rel="import" href="../settings_vars_css.html"> |
| 16 | 15 |
| 17 <dom-module id="settings-import-data-dialog"> | 16 <dom-module id="settings-import-data-dialog"> |
| 18 <template> | 17 <template> |
| 19 <style include="settings-shared md-select"> | 18 <style include="settings-shared md-select"> |
| 20 .description { | 19 .description { |
| 21 align-items: center; | 20 align-items: center; |
| 22 display: flex; | 21 display: flex; |
| 23 min-height: var(--settings-row-min-height); | 22 min-height: var(--settings-row-min-height); |
| 24 } | 23 } |
| 25 | 24 |
| 26 paper-spinner { | 25 paper-spinner { |
| 27 margin: 0 8px; | 26 margin: 0 8px; |
| 28 } | 27 } |
| 29 | 28 |
| 30 #successIcon { | 29 #successIcon { |
| 31 fill: var(--paper-blue-600); | 30 fill: var(--paper-blue-600); |
| 32 height: 80px; | 31 height: 80px; |
| 33 margin: auto; | 32 margin: auto; |
| 34 width: 100%; | 33 width: 100%; |
| 35 } | 34 } |
| 35 | |
| 36 .row { | |
| 37 min-height: var(--settings-row-min-height); | |
|
Dan Beam
2017/02/27 18:39:23
just some ideas/options:
can this style be re-use
dpapad
2017/02/27 19:54:59
Done.
| |
| 38 } | |
| 36 </style> | 39 </style> |
| 37 <dialog is="cr-dialog" id="dialog" ignore-popstate> | 40 <dialog is="cr-dialog" id="dialog" ignore-popstate> |
| 38 <div class="title">$i18n{importTitle}</div> | 41 <div class="title">$i18n{importTitle}</div> |
| 39 <div class="body"> | 42 <div class="body"> |
| 40 <div hidden$="[[!hasImportStatus_( | 43 <div hidden$="[[!hasImportStatus_( |
| 41 importStatusEnum_.SUCCEEDED, importStatus_)]]"> | 44 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 42 <iron-icon id="successIcon" icon="settings:check-circle"> | 45 <iron-icon id="successIcon" icon="settings:check-circle"> |
| 43 </iron-icon> | 46 </iron-icon> |
| 44 <div hidden$="[[!prefs.import_bookmarks.value]]"> | 47 <div hidden$="[[!showBookmarkSuccess_]]"> |
| 45 <div class="description">$i18n{importSuccess}</div> | 48 <div class="description">$i18n{importSuccess}</div> |
| 46 <settings-toggle-button class="start" | 49 <settings-toggle-button class="start" |
| 47 label="$i18n{showBookmarksBar}" | 50 label="$i18n{showBookmarksBar}" |
| 48 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> | 51 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
| 49 </settings-toggle-button> | 52 </settings-toggle-button> |
| 50 </div> | 53 </div> |
| 51 </div> | 54 </div> |
| 52 | 55 |
| 53 <div hidden$="[[hasImportStatus_( | 56 <div hidden$="[[hasImportStatus_( |
| 54 importStatusEnum_.SUCCEEDED, importStatus_)]]"> | 57 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 55 <span class="md-select-wrapper"> | 58 <span class="md-select-wrapper"> |
| 56 <select id="browserSelect" class="md-select" | 59 <select id="browserSelect" class="md-select" |
| 57 on-change="onBrowserProfileSelectionChange_"> | 60 on-change="onBrowserProfileSelectionChange_"> |
| 58 <template is="dom-repeat" items="[[browserProfiles_]]"> | 61 <template is="dom-repeat" items="[[browserProfiles_]]"> |
| 59 <option value="[[item.index]]">[[item.name]]</option> | 62 <option value="[[item.index]]">[[item.name]]</option> |
| 60 </template> | 63 </template> |
| 61 </select> | 64 </select> |
| 62 <span class="md-select-underline"></span> | 65 <span class="md-select-underline"></span> |
| 63 </span> | 66 </span> |
| 64 <div class="description">$i18n{importDescription}</div> | 67 <div class="description">$i18n{importDescription}</div> |
| 65 <settings-checkbox | 68 <div on-change="onCheckboxChange_"> |
| 66 hidden="[[!selected_.history]]" | 69 <div class="row" hidden$="[[!selected_.history]]"> |
| 67 pref="{{prefs.import_history}}" | 70 <paper-checkbox id="history" checked> |
| 68 label="$i18n{importHistory}"> | 71 $i18n{importHistory} |
| 69 </settings-checkbox> | 72 </paper-checkbox> |
| 70 <settings-checkbox | 73 </div> |
| 71 hidden="[[!selected_.favorites]]" | 74 <div class="row" hidden$="[[!selected_.favorites]]"> |
| 72 pref="{{prefs.import_bookmarks}}" | 75 <paper-checkbox id="favorites" checked> |
| 73 label="$i18n{importFavorites}"> | 76 $i18n{importFavorites} |
| 74 </settings-checkbox> | 77 </paper-checkbox> |
| 75 <settings-checkbox | 78 </div> |
| 76 hidden="[[!selected_.passwords]]" | 79 <div class="row" hidden$="[[!selected_.passwords]]"> |
| 77 pref="{{prefs.import_saved_passwords}}" | 80 <paper-checkbox id="passwords" checked> |
| 78 label="$i18n{importPasswords}"> | 81 $i18n{importPasswords}" |
| 79 </settings-checkbox> | 82 </paper-checkbox> |
| 80 <settings-checkbox | 83 </div> |
| 81 hidden="[[!selected_.search]]" | 84 <div class="row" hidden$="[[!selected_.search]]"> |
| 82 pref="{{prefs.import_search_engine}}" | 85 <paper-checkbox id="search" checked> |
| 83 label="$i18n{importSearch}"> | 86 $i18n{importSearch} |
| 84 </settings-checkbox> | 87 </paper-checkbox> |
| 85 <settings-checkbox | 88 </div> |
| 86 hidden="[[!selected_.autofillFormData]]" | 89 <div class="row" hidden="[[!selected_.autofillFormData]]"> |
| 87 pref="{{prefs.import_autofill_form_data}}" | 90 <paper-checkbox id="autofillFormData" checked> |
| 88 label="$i18n{importAutofillFormData}"> | 91 $i18n{importAutofillFormData} |
| 89 </settings-checkbox> | 92 </paper-checkbox> |
| 93 </div> | |
| 94 </div> | |
| 90 </div> | 95 </div> |
| 91 </div> | 96 </div> |
| 92 <div class="button-container"> | 97 <div class="button-container"> |
| 93 <paper-spinner | 98 <paper-spinner |
| 94 active="[[hasImportStatus_( | 99 active="[[hasImportStatus_( |
| 95 importStatusEnum_.IN_PROGRESS, importStatus_)]]" | 100 importStatusEnum_.IN_PROGRESS, importStatus_)]]" |
| 96 hidden="[[hasImportStatus_( | 101 hidden="[[hasImportStatus_( |
| 97 importStatusEnum_.SUCCEEDED, importStatus_)]]"> | 102 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 98 </paper-spinner> | 103 </paper-spinner> |
| 99 <paper-button id="cancel" class="cancel-button" | 104 <paper-button id="cancel" class="cancel-button" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 115 | 120 |
| 116 <paper-button id="done" class="action-button" | 121 <paper-button id="done" class="action-button" |
| 117 hidden$="[[!hasImportStatus_( | 122 hidden$="[[!hasImportStatus_( |
| 118 importStatusEnum_.SUCCEEDED, importStatus_)]]" | 123 importStatusEnum_.SUCCEEDED, importStatus_)]]" |
| 119 on-tap="closeDialog_">$i18n{done}</paper-button> | 124 on-tap="closeDialog_">$i18n{done}</paper-button> |
| 120 </div> | 125 </div> |
| 121 </dialog> | 126 </dialog> |
| 122 </template> | 127 </template> |
| 123 <script src="import_data_dialog.js"></script> | 128 <script src="import_data_dialog.js"></script> |
| 124 </dom-module> | 129 </dom-module> |
| OLD | NEW |