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/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <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-spinner/paper-spi nner.html"> | |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 8 <link rel="import" href="/controls/settings_checkbox.html"> |
| 9 <link rel="import" href="/controls/settings_toggle_button.html"> | |
| 10 <link rel="import" href="/icons.html"> | |
| 7 <link rel="import" href="/md_select_css.html"> | 11 <link rel="import" href="/md_select_css.html"> |
| 8 <link rel="import" href="/people_page/import_data_browser_proxy.html"> | 12 <link rel="import" href="/people_page/import_data_browser_proxy.html"> |
| 9 | 13 |
| 10 <dom-module id="settings-import-data-dialog"> | 14 <dom-module id="settings-import-data-dialog"> |
| 11 <template> | 15 <template> |
| 12 <style include="settings-shared md-select"> | 16 <style include="settings-shared md-select"> |
| 13 #description { | 17 .description { |
| 14 align-items: center; | 18 align-items: center; |
| 15 display: flex; | 19 display: flex; |
| 16 min-height: var(--settings-row-min-height); | 20 min-height: var(--settings-row-min-height); |
| 17 } | 21 } |
| 22 | |
| 23 paper-spinner { | |
| 24 margin: 0 8px; | |
| 25 } | |
| 26 | |
| 27 .icon-container { | |
|
tommycli
2016/11/16 17:23:52
nit: Can we remove the need for this by giving the
dpapad
2016/11/16 21:33:02
Done.
| |
| 28 text-align: center; | |
| 29 } | |
| 30 | |
| 31 iron-icon { | |
|
tommycli
2016/11/16 17:23:53
Although there is only one iron-icon here, it may
dpapad
2016/11/16 21:33:02
Done.
| |
| 32 fill: var(--paper-blue-600); | |
| 33 height: 80px; | |
| 34 width: 80px; | |
| 35 } | |
| 18 </style> | 36 </style> |
| 19 <dialog is="cr-dialog" id="dialog"> | 37 <dialog is="cr-dialog" id="dialog"> |
| 20 <div class="title">$i18n{importTitle}</div> | 38 <div class="title">$i18n{importTitle}</div> |
| 21 <div class="body"> | 39 <div class="body"> |
| 22 <span class="md-select-wrapper"> | 40 <div hidden$="[[!hasImportStatus_( |
| 23 <select id="browserSelect" class="md-select" on-change="onChange_"> | 41 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 24 <template is="dom-repeat" items="[[browserProfiles_]]"> | 42 <div class="icon-container"> |
| 25 <option value="[[item.index]]">[[item.name]]</option> | 43 <iron-icon icon="settings:check-circle"></iron-icon> |
| 26 </template> | 44 </div> |
| 27 </select> | 45 <div hidden$="[[!prefs.import_bookmarks.value]]"> |
| 28 <span class="md-select-underline"></span> | 46 <div class="description">$i18n{importReady}</div> |
| 29 </span> | 47 <settings-toggle-button class="start" |
| 30 <div id="description">$i18n{importDescription}</div> | 48 label="$i18n{showBookmarksBar}" |
| 31 <div> | 49 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> |
| 32 <settings-checkbox | 50 </settings-toggle-button> |
| 33 hidden="[[!selected_.history]]" | 51 </div> |
| 34 pref="{{prefs.import_history}}" | 52 </div> |
| 35 label="$i18n{importHistory}"> | 53 |
| 36 </settings-checkbox> | 54 <div hidden$="[[hasImportStatus_( |
| 37 <settings-checkbox | 55 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 38 hidden="[[!selected_.favorites]]" | 56 <span class="md-select-wrapper"> |
| 39 pref="{{prefs.import_bookmarks}}" | 57 <select id="browserSelect" class="md-select" on-change="onChange_"> |
| 40 label="$i18n{importFavorites}"> | 58 <template is="dom-repeat" items="[[browserProfiles_]]"> |
| 41 </settings-checkbox> | 59 <option value="[[item.index]]">[[item.name]]</option> |
| 42 <settings-checkbox | 60 </template> |
| 43 hidden="[[!selected_.passwords]]" | 61 </select> |
| 44 pref="{{prefs.import_saved_passwords}}" | 62 <span class="md-select-underline"></span> |
| 45 label="$i18n{importPasswords}"> | 63 </span> |
| 46 </settings-checkbox> | 64 <div class="description">$i18n{importDescription}</div> |
| 47 <settings-checkbox | 65 <div on-iron-change="onCheckboxChange_"> |
| 48 hidden="[[!selected_.search]]" | 66 <settings-checkbox |
| 49 pref="{{prefs.import_search_engine}}" | 67 hidden="[[!selected_.history]]" |
| 50 label="$i18n{importSearch}"> | 68 pref="{{prefs.import_history}}" |
| 51 </settings-checkbox> | 69 label="$i18n{importHistory}"> |
| 52 <settings-checkbox | 70 </settings-checkbox> |
| 53 hidden="[[!selected_.autofillFormData]]" | 71 <settings-checkbox |
| 54 pref="{{prefs.import_autofill_form_data}}" | 72 hidden="[[!selected_.favorites]]" |
| 55 label="$i18n{importAutofillFormData}"> | 73 pref="{{prefs.import_bookmarks}}" |
| 56 </settings-checkbox> | 74 label="$i18n{importFavorites}"> |
| 75 </settings-checkbox> | |
| 76 <settings-checkbox | |
| 77 hidden="[[!selected_.passwords]]" | |
| 78 pref="{{prefs.import_saved_passwords}}" | |
| 79 label="$i18n{importPasswords}"> | |
| 80 </settings-checkbox> | |
| 81 <settings-checkbox | |
| 82 hidden="[[!selected_.search]]" | |
| 83 pref="{{prefs.import_search_engine}}" | |
| 84 label="$i18n{importSearch}"> | |
| 85 </settings-checkbox> | |
| 86 <settings-checkbox | |
| 87 hidden="[[!selected_.autofillFormData]]" | |
| 88 pref="{{prefs.import_autofill_form_data}}" | |
| 89 label="$i18n{importAutofillFormData}"> | |
| 90 </settings-checkbox> | |
| 91 </div> | |
|
tommycli
2016/11/16 17:23:52
It looks like this whole div block is basically un
dpapad
2016/11/16 21:33:01
It was just tabbed over, but I ended up undoing th
| |
| 57 </div> | 92 </div> |
| 58 </div> | 93 </div> |
| 59 <div class="button-container"> | 94 <div class="button-container"> |
| 60 <div class="action-buttons"> | 95 <paper-spinner |
|
tommycli
2016/11/16 17:23:52
any situation in which it's not-hidden but inactiv
dpapad
2016/11/16 21:33:02
It is subtle. When you change active to false, pap
tommycli
2016/11/16 21:43:40
Acknowledged.
| |
| 61 <paper-button class="cancel-button" id="cancel" on-tap="onCancelTap_"> | 96 active="[[hasImportStatus_( |
| 62 $i18n{cancel} | 97 importStatusEnum_.IN_PROGRESS, importStatus_)]]" |
| 63 </paper-button> | 98 hidden="[[hasImportStatus_( |
| 64 <paper-button id="actionButton" class="action-button" | 99 importStatusEnum_.SUCCEEDED, importStatus_)]]"> |
| 65 on-tap="onActionButtonTap_"> | 100 </paper-spinner> |
| 66 [[getActionButtonText_(selected_)]] | 101 <paper-button class="cancel-button" id="cancel" |
| 67 </paper-button> | 102 hidden="[[hasImportStatus_( |
| 68 </div> | 103 importStatusEnum_.SUCCEEDED, importStatus_)]]" |
| 104 disabled="[[hasImportStatus_( | |
| 105 importStatusEnum_.IN_PROGRESS, importStatus_)]]" | |
| 106 on-tap="closeDialog_"> | |
| 107 $i18n{cancel} | |
| 108 </paper-button> | |
| 109 <paper-button id="actionButton" class="action-button" | |
|
tommycli
2016/11/16 17:23:52
nit: Maybe call this confirmButton or importButton
dpapad
2016/11/16 21:33:01
Removed "id" completely, since it is not needed ye
| |
| 110 hidden="[[hasImportStatus_( | |
| 111 importStatusEnum_.SUCCEEDED, importStatus_)]]" | |
| 112 disabled="[[disallowAction_( | |
| 113 importStatus_, noCategorySelected_)]]" | |
| 114 on-tap="onActionButtonTap_"> | |
| 115 [[getActionButtonText_(selected_)]] | |
| 116 </paper-button> | |
| 117 | |
| 118 <paper-button class="action-button" | |
| 119 hidden$="[[!hasImportStatus_( | |
| 120 importStatusEnum_.SUCCEEDED, importStatus_)]]" | |
| 121 on-tap="closeDialog_">$i18n{done}</paper-button> | |
| 69 </div> | 122 </div> |
| 70 </dialog> | 123 </dialog> |
| 71 </template> | 124 </template> |
| 72 <script src="import_data_dialog.js"></script> | 125 <script src="import_data_dialog.js"></script> |
| 73 </dom-module> | 126 </dom-module> |
| OLD | NEW |