Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: chrome/browser/resources/settings/people_page/import_data_dialog.html

Issue 2727513002: Revert of MD Settings: Stop using prefs to populate import data dialog. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/import_data_dialog.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 9 <link rel="import" href="../controls/settings_checkbox.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">
14 <link rel="import" href="../settings_vars_css.html"> 15 <link rel="import" href="../settings_vars_css.html">
15 16
16 <dom-module id="settings-import-data-dialog"> 17 <dom-module id="settings-import-data-dialog">
17 <template> 18 <template>
18 <style include="settings-shared md-select"> 19 <style include="settings-shared md-select">
19 .description { 20 .description {
20 align-items: center; 21 align-items: center;
21 display: flex; 22 display: flex;
23 min-height: var(--settings-row-min-height);
22 } 24 }
23 25
24 paper-spinner { 26 paper-spinner {
25 margin: 0 8px; 27 margin: 0 8px;
26 } 28 }
27 29
28 #successIcon { 30 #successIcon {
29 fill: var(--paper-blue-600); 31 fill: var(--paper-blue-600);
30 height: 80px; 32 height: 80px;
31 margin: auto; 33 margin: auto;
32 width: 100%; 34 width: 100%;
33 } 35 }
34
35 .row {
36 min-height: var(--settings-row-min-height);
37 }
38 </style> 36 </style>
39 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" ignore-popstate > 37 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" ignore-popstate >
40 <div class="title">$i18n{importTitle}</div> 38 <div class="title">$i18n{importTitle}</div>
41 <div class="body"> 39 <div class="body">
42 <div hidden$="[[!hasImportStatus_( 40 <div hidden$="[[!hasImportStatus_(
43 importStatusEnum_.SUCCEEDED, importStatus_)]]"> 41 importStatusEnum_.SUCCEEDED, importStatus_)]]">
44 <iron-icon id="successIcon" icon="settings:check-circle"> 42 <iron-icon id="successIcon" icon="settings:check-circle">
45 </iron-icon> 43 </iron-icon>
46 <div hidden$="[[!showBookmarkSuccess_]]"> 44 <div hidden$="[[!prefs.import_bookmarks.value]]">
47 <div class="description row">$i18n{importSuccess}</div> 45 <div class="description">$i18n{importSuccess}</div>
48 <settings-toggle-button class="start" 46 <settings-toggle-button class="start"
49 label="$i18n{showBookmarksBar}" 47 label="$i18n{showBookmarksBar}"
50 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 48 pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
51 </settings-toggle-button> 49 </settings-toggle-button>
52 </div> 50 </div>
53 </div> 51 </div>
54 52
55 <div hidden$="[[hasImportStatus_( 53 <div hidden$="[[hasImportStatus_(
56 importStatusEnum_.SUCCEEDED, importStatus_)]]"> 54 importStatusEnum_.SUCCEEDED, importStatus_)]]">
57 <span class="md-select-wrapper"> 55 <span class="md-select-wrapper">
58 <select id="browserSelect" class="md-select" 56 <select id="browserSelect" class="md-select"
59 on-change="onBrowserProfileSelectionChange_"> 57 on-change="onBrowserProfileSelectionChange_">
60 <template is="dom-repeat" items="[[browserProfiles_]]"> 58 <template is="dom-repeat" items="[[browserProfiles_]]">
61 <option value="[[item.index]]">[[item.name]]</option> 59 <option value="[[item.index]]">[[item.name]]</option>
62 </template> 60 </template>
63 </select> 61 </select>
64 <span class="md-select-underline"></span> 62 <span class="md-select-underline"></span>
65 </span> 63 </span>
66 <div class="description row">$i18n{importDescription}</div> 64 <div class="description">$i18n{importDescription}</div>
67 <div on-change="onCheckboxChange_"> 65 <settings-checkbox
68 <div class="row" hidden$="[[!selected_.history]]"> 66 hidden="[[!selected_.history]]"
69 <paper-checkbox id="history" checked> 67 pref="{{prefs.import_history}}"
70 $i18n{importHistory} 68 label="$i18n{importHistory}">
71 </paper-checkbox> 69 </settings-checkbox>
72 </div> 70 <settings-checkbox
73 <div class="row" hidden$="[[!selected_.favorites]]"> 71 hidden="[[!selected_.favorites]]"
74 <paper-checkbox id="favorites" checked> 72 pref="{{prefs.import_bookmarks}}"
75 $i18n{importFavorites} 73 label="$i18n{importFavorites}">
76 </paper-checkbox> 74 </settings-checkbox>
77 </div> 75 <settings-checkbox
78 <div class="row" hidden$="[[!selected_.passwords]]"> 76 hidden="[[!selected_.passwords]]"
79 <paper-checkbox id="passwords" checked> 77 pref="{{prefs.import_saved_passwords}}"
80 $i18n{importPasswords}" 78 label="$i18n{importPasswords}">
81 </paper-checkbox> 79 </settings-checkbox>
82 </div> 80 <settings-checkbox
83 <div class="row" hidden$="[[!selected_.search]]"> 81 hidden="[[!selected_.search]]"
84 <paper-checkbox id="search" checked> 82 pref="{{prefs.import_search_engine}}"
85 $i18n{importSearch} 83 label="$i18n{importSearch}">
86 </paper-checkbox> 84 </settings-checkbox>
87 </div> 85 <settings-checkbox
88 <div class="row" hidden="[[!selected_.autofillFormData]]"> 86 hidden="[[!selected_.autofillFormData]]"
89 <paper-checkbox id="autofillFormData" checked> 87 pref="{{prefs.import_autofill_form_data}}"
90 $i18n{importAutofillFormData} 88 label="$i18n{importAutofillFormData}">
91 </paper-checkbox> 89 </settings-checkbox>
92 </div>
93 </div>
94 </div> 90 </div>
95 </div> 91 </div>
96 <div class="button-container"> 92 <div class="button-container">
97 <paper-spinner 93 <paper-spinner
98 active="[[hasImportStatus_( 94 active="[[hasImportStatus_(
99 importStatusEnum_.IN_PROGRESS, importStatus_)]]" 95 importStatusEnum_.IN_PROGRESS, importStatus_)]]"
100 hidden="[[hasImportStatus_( 96 hidden="[[hasImportStatus_(
101 importStatusEnum_.SUCCEEDED, importStatus_)]]"> 97 importStatusEnum_.SUCCEEDED, importStatus_)]]">
102 </paper-spinner> 98 </paper-spinner>
103 <paper-button id="cancel" class="cancel-button" 99 <paper-button id="cancel" class="cancel-button"
(...skipping 15 matching lines...) Expand all
119 115
120 <paper-button id="done" class="action-button" 116 <paper-button id="done" class="action-button"
121 hidden$="[[!hasImportStatus_( 117 hidden$="[[!hasImportStatus_(
122 importStatusEnum_.SUCCEEDED, importStatus_)]]" 118 importStatusEnum_.SUCCEEDED, importStatus_)]]"
123 on-tap="closeDialog_">$i18n{done}</paper-button> 119 on-tap="closeDialog_">$i18n{done}</paper-button>
124 </div> 120 </div>
125 </dialog> 121 </dialog>
126 </template> 122 </template>
127 <script src="import_data_dialog.js"></script> 123 <script src="import_data_dialog.js"></script>
128 </dom-module> 124 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/import_data_dialog.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698