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

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

Issue 2769383002: Firefox overlay is seen opened even if Import Overlay is Cancelled.
Patch Set: Fixing Review Comments Created 3 years, 8 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview 'settings-import-data-dialog' is a component for importing 6 * @fileoverview 'settings-import-data-dialog' is a component for importing
7 * bookmarks and other data from other sources. 7 * bookmarks and other data from other sources.
8 */ 8 */
9 Polymer({ 9 Polymer({
10 is: 'settings-import-data-dialog', 10 is: 'settings-import-data-dialog',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 /** @private */ 122 /** @private */
123 onActionButtonTap_: function() { 123 onActionButtonTap_: function() {
124 if (this.isImportFromFileSelected_()) 124 if (this.isImportFromFileSelected_())
125 this.browserProxy_.importFromBookmarksFile(); 125 this.browserProxy_.importFromBookmarksFile();
126 else 126 else
127 this.browserProxy_.importData(this.$.browserSelect.selectedIndex); 127 this.browserProxy_.importData(this.$.browserSelect.selectedIndex);
128 }, 128 },
129 129
130 /** @private */ 130 /** @private */
131 closeDialog_: function() { 131 closeDialog_: function() {
132 //During Closing the import dialog also send close to "import lock dialog "
133 //if it is shown on the screen.
Ilya Sherman 2017/03/29 06:29:02 nit: Thanks for adding a comment here. I'd rephras
nikhil.sahni 2017/03/30 12:13:35 Done.
134 this.browserProxy_.closeImportLockDialog();
132 this.$.dialog.close(); 135 this.$.dialog.close();
133 }, 136 },
134 137
135 /** 138 /**
136 * @return {boolean} Whether the import button should be disabled. 139 * @return {boolean} Whether the import button should be disabled.
137 * @private 140 * @private
138 */ 141 */
139 shouldDisableImport_: function() { 142 shouldDisableImport_: function() {
140 return this.hasImportStatus_(settings.ImportDataStatus.IN_PROGRESS) || 143 return this.hasImportStatus_(settings.ImportDataStatus.IN_PROGRESS) ||
141 this.noImportDataTypeSelected_; 144 this.noImportDataTypeSelected_;
142 }, 145 },
143 }); 146 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698