| Index: chrome/browser/resources/file_manager/js/file_manager.js
|
| diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
|
| index f1276c96f758968753f935a8b969184c062e293b..4b1285335fa1f8f17ad553bd6c686490b4999c28 100644
|
| --- a/chrome/browser/resources/file_manager/js/file_manager.js
|
| +++ b/chrome/browser/resources/file_manager/js/file_manager.js
|
| @@ -791,6 +791,8 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
|
| this.alert = new d.AlertDialog(this.dialogDom_);
|
| this.confirm = new d.ConfirmDialog(this.dialogDom_);
|
| this.prompt = new d.PromptDialog(this.dialogDom_);
|
| +
|
| + FileManagerDialogBase.setFileManager(this);
|
| this.shareDialog_ = new ShareDialog(this.dialogDom_);
|
| this.defaultTaskPicker =
|
| new cr.filebrowser.DefaultActionDialog(this.dialogDom_);
|
| @@ -2114,9 +2116,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
|
| }
|
| // Add the overlapped class to prevent the applicaiton window from
|
| // captureing mouse events.
|
| - this.enableDragOnTitleArea_(false);
|
| this.shareDialog_.show(entries[0], function(result) {
|
| - this.enableDragOnTitleArea_(true);
|
| if (result == ShareDialog.Result.NETWORK_ERROR)
|
| this.error.show(str('SHARE_ERROR'));
|
| }.bind(this));
|
| @@ -3791,7 +3791,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
|
| };
|
| items.push(item);
|
| }
|
| - this.defaultTaskPicker.show(
|
| + var show = this.defaultTaskPicker.showOkCancelDialog(
|
| str('CHANGE_DEFAULT_APP_BUTTON_LABEL'),
|
| '',
|
| items,
|
| @@ -3799,6 +3799,8 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
|
| function(action) {
|
| ActionChoiceUtil.setRememberedActionId(action.id);
|
| });
|
| + if (!show)
|
| + console.error('DefaultTaskPicker can\'t be shown.');
|
| }.bind(this);
|
|
|
| ActionChoiceUtil.getDefinedActions(loadTimeData, function(actions) {
|
|
|