diff options
4 files changed, 12 insertions, 15 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index d259f6a..2a87fbd 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -12573,9 +12573,6 @@ Some features may be unavailable. Please check that the profile exists and you Recovered files from Google Drive </message> - <message name="IDS_FILE_BROWSER_CONFLICT_DIALOG_TITLE" desc="Title of the conflict dialog shown when a file transfer operation is conflicted."> - Conflict - </message> <message name="IDS_FILE_BROWSER_CONFLICT_DIALOG_MESSAGE" desc="Message of the conflict dialog shown when a file transfer operation is conflicted."> A file named "<ph name="FILENAME">$1<ex>photo.jpg</ex></ph>" already exists. What do you want to do? </message> diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc index 823f106..262e0e0 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc @@ -240,8 +240,6 @@ bool FileBrowserPrivateGetStringsFunction::RunImpl() { SET_STRING("PHOTO_IMPORT_MY_PHOTOS_DIRECTORY_NAME", IDS_FILE_BROWSER_PHOTO_IMPORT_MY_PHOTOS_DIRECTORY_NAME); - SET_STRING("CONFLICT_DIALOG_TITLE", - IDS_FILE_BROWSER_CONFLICT_DIALOG_TITLE); SET_STRING("CONFLICT_DIALOG_MESSAGE", IDS_FILE_BROWSER_CONFLICT_DIALOG_MESSAGE); SET_STRING("CONFLICT_DIALOG_KEEP_BOTH", diff --git a/chrome/browser/resources/file_manager/foreground/css/file_manager.css b/chrome/browser/resources/file_manager/foreground/css/file_manager.css index 4c0d034..4fb2f77 100644 --- a/chrome/browser/resources/file_manager/foreground/css/file_manager.css +++ b/chrome/browser/resources/file_manager/foreground/css/file_manager.css @@ -1921,15 +1921,20 @@ menuitem#thumbnail-view[lead]:not([disabled]) { display: none; } -#conflict-confirm-dialog .apply-all-line { - margin: 8px; - text-align: end; +#conflict-confirm-dialog .cr-dialog-buttons { + align-items: baseline; + display: flex; } -#conflict-confirm-dialog input { +#conflict-confirm-dialog input[type=checkbox] { + -webkit-margin-start: -2px; width: auto; } +#conflict-confirm-dialog label { + flex: 1 0 auto; +} + /* Progress center */ #progress-center { diff --git a/chrome/browser/resources/file_manager/foreground/js/ui/conflict_dialog.js b/chrome/browser/resources/file_manager/foreground/js/ui/conflict_dialog.js index 9bbd39a..8aecd73 100644 --- a/chrome/browser/resources/file_manager/foreground/js/ui/conflict_dialog.js +++ b/chrome/browser/resources/file_manager/foreground/js/ui/conflict_dialog.js @@ -37,10 +37,6 @@ function ConflictDialog(parentNode) { var applyAllLabel = parentNode.ownerDocument.createElement('label'); applyAllLabel.textContent = str('CONFLICT_DIALOG_APPLY_TO_ALL'); applyAllLabel.setAttribute('for', this.applyAllCheckbox_.id); - var applyAllLine = parentNode.ownerDocument.createElement('div'); - applyAllLine.className = 'apply-all-line'; - applyAllLine.appendChild(this.applyAllCheckbox_); - applyAllLine.appendChild(applyAllLabel); /** * Element of the keep both button. @@ -66,12 +62,13 @@ function ConflictDialog(parentNode) { // Buttons line. var buttons = this.okButton_.parentNode; + buttons.insertBefore(this.applyAllCheckbox_, this.okButton_); + buttons.insertBefore(applyAllLabel, this.okButton_); buttons.replaceChild(this.keepBothButton_, this.okButton_); buttons.appendChild(this.replaceButton_); // Frame this.frame_.id = 'conflict-confirm-dialog'; - this.frame_.insertBefore(applyAllLine, buttons); } /** @@ -105,7 +102,7 @@ ConflictDialog.prototype.show = function(fileName, callback) { this.callback_ = callback; FileManagerDialogBase.prototype.showOkCancelDialog.call( this, - str('CONFLICT_DIALOG_TITLE'), + '', // We dont't show the title for the dialog. strf('CONFLICT_DIALOG_MESSAGE', fileName)); return true; }; |