Skip to content

GitLab

T
tangled
Commit f37aa1b9 authored by oka's avatar oka Committed by Commit bot
Browse files
Options

Compile file_manager_commands in gyp v2. 

There were circular deps between file_manager_commands and file_manager.
This change removes dependency from file_manager_commands to
file_manager by extracting an interface from FileManager needed for
file_manager_commands to compile.
Also inlined some simple methods in FileManager, which are used
only from file_manager_commands.

BUG=636289
TEST=run_compiler
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2846163002
Cr-Commit-Position: refs/heads/master@{#467917}
parent 6c540a0c
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 143 deletions
ui/file_manager/externs/command_handler_deps.js 0 → 100644
View file @ f37aa1b9
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/**
* Interface on which |CommandHandler| depends.
* @interface
*/
function CommandHandlerDeps(){};
/**
* @type {ActionsController}
*/
CommandHandlerDeps.prototype.actionsController;
/**
* @type {BackgroundWindow}
*/
CommandHandlerDeps.prototype.backgroundPage;
/**
* @type {DialogType}
*/
CommandHandlerDeps.prototype.dialogType;
/**
* @type {DirectoryModel}
*/
CommandHandlerDeps.prototype.directoryModel;
/**
* @type {DirectoryTree}
*/
CommandHandlerDeps.prototype.directoryTree;
/**
* @type {DirectoryTreeNamingController}
*/
CommandHandlerDeps.prototype.directoryTreeNamingController;
/**
* @type {Document}
*/
CommandHandlerDeps.prototype.document;
/**
* @type {FileFilter}
*/
CommandHandlerDeps.prototype.fileFilter;
/**
* @type {FileOperationManager}
*/
CommandHandlerDeps.prototype.fileOperationManager;
/**
* @type {FileTransferController}
*/
CommandHandlerDeps.prototype.fileTransferController;
/**
* @type {FileSelectionHandler}
*/
CommandHandlerDeps.prototype.selectionHandler;
/**
* @type {NamingController}
*/
CommandHandlerDeps.prototype.namingController;
/**
* @type {ProvidersModel}
*/
CommandHandlerDeps.prototype.providersModel;
/**
* @type {SpinnerController}
*/
CommandHandlerDeps.prototype.spinnerController;
/**
* @type {TaskController}
*/
CommandHandlerDeps.prototype.taskController;
/**
* @type {FileManagerUI}
*/
CommandHandlerDeps.prototype.ui;
/**
* @type {VolumeManagerWrapper}
*/
CommandHandlerDeps.prototype.volumeManager;
/**
* @return {DirectoryEntry|FakeEntry}
*/
CommandHandlerDeps.prototype.getCurrentDirectoryEntry = function() {};
/**
* @return {FileSelection}
*/
CommandHandlerDeps.prototype.getSelection = function() {};
ui/file_manager/externs/compiled_resources2.gyp
View file @ f37aa1b9
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
'target_name': 'chrome_webstore_widget_private', 'target_name': 'chrome_webstore_widget_private',
'includes': ['../../../third_party/closure_compiler/include_js.gypi'], 'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
}, },
{
'target_name': 'command_handler_deps',
'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
},
{ {
'target_name': 'connection', 'target_name': 'connection',
'includes': ['../../../third_party/closure_compiler/include_js.gypi'], 'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
......
ui/file_manager/file_manager/foreground/js/compiled_resources.gyp
View file @ f37aa1b9
...@@ -179,6 +179,7 @@ ...@@ -179,6 +179,7 @@
'../../../externs/chrome_echo_private.js', '../../../externs/chrome_echo_private.js',
'../../../externs/chrome_test.js', '../../../externs/chrome_test.js',
'../../../externs/chrome_webstore_widget_private.js', '../../../externs/chrome_webstore_widget_private.js',
'../../../externs/command_handler_deps.js',
'../../../externs/connection.js', '../../../externs/connection.js',
'../../../externs/css_rule.js', '../../../externs/css_rule.js',
'../../../externs/directory_change_event.js', '../../../externs/directory_change_event.js',
......
ui/file_manager/file_manager/foreground/js/compiled_resources2.gyp
View file @ f37aa1b9
...@@ -148,10 +148,29 @@ ...@@ -148,10 +148,29 @@
# 'target_name': 'file_manager', # 'target_name': 'file_manager',
# 'includes': ['../../../compile_js2.gypi'], # 'includes': ['../../../compile_js2.gypi'],
# }, # },
# { {
# 'target_name': 'file_manager_commands', 'target_name': 'file_manager_commands',
# 'includes': ['../../../compile_js2.gypi'], 'dependencies': [
# }, '../../../externs/compiled_resources2.gyp:background_window',
'../../../externs/compiled_resources2.gyp:command_handler_deps',
'../../background/js/compiled_resources2.gyp:file_operation_manager',
'actions_controller',
'dialog_type',
'directory_contents',
'directory_model',
'directory_tree_naming_controller',
'file_selection',
'file_transfer_controller',
'naming_controller',
'providers_model',
'spinner_controller',
'task_controller',
'ui/compiled_resources2.gyp:directory_tree',
'ui/compiled_resources2.gyp:file_manager_ui',
'volume_manager_wrapper',
],
'includes': ['../../../compile_js2.gypi'],
},
{ {
'target_name': 'file_selection', 'target_name': 'file_selection',
'dependencies': [ 'dependencies': [
......
ui/file_manager/file_manager/foreground/js/file_manager.js
View file @ f37aa1b9
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* FileManager objects encapsulate the functionality of the file selector * FileManager objects encapsulate the functionality of the file selector
* dialogs, as well as the full screen file manager application. * dialogs, as well as the full screen file manager application.
* *
* @implements {CommandHandlerDeps}
* @constructor * @constructor
* @struct * @struct
*/ */
...@@ -335,6 +336,12 @@ FileManager.prototype = /** @struct */ { ...@@ -335,6 +336,12 @@ FileManager.prototype = /** @struct */ {
get directoryModel() { get directoryModel() {
return this.directoryModel_; return this.directoryModel_;
}, },
/**
* @return {DirectoryTreeNamingController}
*/
get directoryTreeNamingController() {
return this.directoryTreeNamingController_;
},
/** /**
* @return {!FileFilter} * @return {!FileFilter}
*/ */
...@@ -371,6 +378,12 @@ FileManager.prototype = /** @struct */ { ...@@ -371,6 +378,12 @@ FileManager.prototype = /** @struct */ {
get metadataModel() { get metadataModel() {
return this.metadataModel_; return this.metadataModel_;
}, },
/**
* @return {FileSelectionHandler}
*/
get selectionHandler() {
return this.selectionHandler_;
},
/** /**
* @return {DirectoryTree} * @return {DirectoryTree}
*/ */
...@@ -1093,13 +1106,6 @@ FileManager.prototype = /** @struct */ { ...@@ -1093,13 +1106,6 @@ FileManager.prototype = /** @struct */ {
this.launchParams_); this.launchParams_);
}; };
/**
* @return {DirectoryTreeNamingController}
*/
FileManager.prototype.getDirectoryTreeNamingController = function() {
return this.directoryTreeNamingController_;
};
/** /**
* @private * @private
*/ */
...@@ -1369,40 +1375,6 @@ FileManager.prototype = /** @struct */ { ...@@ -1369,40 +1375,6 @@ FileManager.prototype = /** @struct */ {
} }
}; };
/**
* TODO(mtomasz): Move this to a utility function working on the root type.
* @return {boolean} True if the current directory content is from Google
* Drive.
*/
FileManager.prototype.isOnDrive = function() {
return this.directoryModel_.isOnDrive();
};
/**
* @return {boolean} True if the current directory content is from MTP volume.
*/
FileManager.prototype.isOnMTP = function() {
return this.directoryModel_.isOnMTP();
};
/**
* Check if the drive-related setting items should be shown on currently
* displayed gear menu.
* @return {boolean} True if those setting items should be shown.
*/
FileManager.prototype.shouldShowDriveSettings = function() {
return this.isOnDrive();
};
/**
* Tells whether the current directory is read only.
* TODO(mtomasz): Remove and use EntryLocation directly.
* @return {boolean} True if read only, false otherwise.
*/
FileManager.prototype.isOnReadonlyDirectory = function() {
return this.directoryModel_.isReadOnly();
};
/** /**
* Return DirectoryEntry of the current directory or null. * Return DirectoryEntry of the current directory or null.
* @return {DirectoryEntry|FakeEntry} DirectoryEntry of the current directory. * @return {DirectoryEntry|FakeEntry} DirectoryEntry of the current directory.
......
ui/file_manager/file_manager/foreground/js/file_manager_commands.js
View file @ f37aa1b9
...@@ -28,14 +28,14 @@ var Command = function() {}; ...@@ -28,14 +28,14 @@ var Command = function() {};
/** /**
* Handles the execute event. * Handles the execute event.
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps.
*/ */
Command.prototype.execute = function(event, fileManager) {}; Command.prototype.execute = function(event, fileManager) {};
/** /**
* Handles the can execute event. * Handles the can execute event.
* @param {!Event} event Can execute event. * @param {!Event} event Can execute event.
* @param {!FileManager} fileManager FileManager. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps.
*/ */
Command.prototype.canExecute = function(event, fileManager) {}; Command.prototype.canExecute = function(event, fileManager) {};
...@@ -106,7 +106,7 @@ CommandUtil.getParentEntry = function(element, directoryModel) { ...@@ -106,7 +106,7 @@ CommandUtil.getParentEntry = function(element, directoryModel) {
/** /**
* @param {EventTarget} element * @param {EventTarget} element
* @param {!FileManager} fileManager * @param {!CommandHandlerDeps} fileManager
* @return {VolumeInfo} * @return {VolumeInfo}
*/ */
CommandUtil.getElementVolumeInfo = function(element, fileManager) { CommandUtil.getElementVolumeInfo = function(element, fileManager) {
...@@ -122,7 +122,7 @@ CommandUtil.getElementVolumeInfo = function(element, fileManager) { ...@@ -122,7 +122,7 @@ CommandUtil.getElementVolumeInfo = function(element, fileManager) {
}; };
/** /**
* @param {!FileManager} fileManager * @param {!CommandHandlerDeps} fileManager
* @return {VolumeInfo} * @return {VolumeInfo}
*/ */
CommandUtil.getCurrentVolumeInfo = function(fileManager) { CommandUtil.getCurrentVolumeInfo = function(fileManager) {
...@@ -151,21 +151,21 @@ CommandUtil.getEntryFromNavigationModelItem_ = function(item) { ...@@ -151,21 +151,21 @@ CommandUtil.getEntryFromNavigationModelItem_ = function(item) {
/** /**
* Checks if command can be executed on drive. * Checks if command can be executed on drive.
* @param {!Event} event Command event to mark. * @param {!Event} event Command event to mark.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
CommandUtil.canExecuteEnabledOnDriveOnly = function(event, fileManager) { CommandUtil.canExecuteEnabledOnDriveOnly = function(event, fileManager) {
event.canExecute = fileManager.isOnDrive(); event.canExecute = fileManager.directoryModel.isOnDrive();
}; };
/** /**
* Sets the command as visible only when the current volume is drive and it's * Sets the command as visible only when the current volume is drive and it's
* running as a normal app, not as a modal dialog. * running as a normal app, not as a modal dialog.
* @param {!Event} event Command event to mark. * @param {!Event} event Command event to mark.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
CommandUtil.canExecuteVisibleOnDriveInNormalAppModeOnly = CommandUtil.canExecuteVisibleOnDriveInNormalAppModeOnly = function(
function(event, fileManager) { event, fileManager) {
var enabled = fileManager.isOnDrive() && var enabled = fileManager.directoryModel.isOnDrive() &&
!DialogType.isModal(fileManager.dialogType); !DialogType.isModal(fileManager.dialogType);
event.canExecute = enabled; event.canExecute = enabled;
event.command.setHidden(!enabled); event.command.setHidden(!enabled);
...@@ -218,14 +218,14 @@ CommandUtil.forceDefaultHandler = function(node, commandId) { ...@@ -218,14 +218,14 @@ CommandUtil.forceDefaultHandler = function(node, commandId) {
CommandUtil.defaultCommand = /** @type {Command} */ ({ CommandUtil.defaultCommand = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.document.execCommand(event.command.id); fileManager.document.execCommand(event.command.id);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = fileManager.document.queryCommandEnabled( event.canExecute = fileManager.document.queryCommandEnabled(
...@@ -242,14 +242,14 @@ CommandUtil.createVolumeSwitchCommand = function(index) { ...@@ -242,14 +242,14 @@ CommandUtil.createVolumeSwitchCommand = function(index) {
return /** @type {Command} */ ({ return /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.directoryTree.activateByIndex(index - 1); fileManager.directoryTree.activateByIndex(index - 1);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = index > 0 && event.canExecute = index > 0 &&
...@@ -312,15 +312,15 @@ CommandUtil.shouldShowMenuItemForEntry = function(volumeManager, entry) { ...@@ -312,15 +312,15 @@ CommandUtil.shouldShowMenuItemForEntry = function(volumeManager, entry) {
/** /**
* Handle of the command events. * Handle of the command events.
* @param {!FileManager} fileManager FileManager. * @param {!CommandHandlerDeps} fileManager Classes |CommandHalder| depends.
* @param {!FileSelectionHandler} selectionHandler * @param {!FileSelectionHandler} selectionHandler
* @constructor * @constructor
* @struct * @struct
*/ */
var CommandHandler = function(fileManager, selectionHandler) { var CommandHandler = function(fileManager, selectionHandler) {
/** /**
* FileManager. * CommandHandlerDeps.
* @type {!FileManager} * @type {!CommandHandlerDeps}
* @private * @private
*/ */
this.fileManager_ = fileManager; this.fileManager_ = fileManager;
...@@ -420,7 +420,7 @@ CommandHandler.COMMANDS_ = {}; ...@@ -420,7 +420,7 @@ CommandHandler.COMMANDS_ = {};
CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager The file manager instance. * @param {!CommandHandlerDeps} fileManager The file manager instance.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var errorCallback = function() { var errorCallback = function() {
...@@ -436,10 +436,7 @@ CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({ ...@@ -436,10 +436,7 @@ CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({
return; return;
} }
fileManager.volumeManager_.unmount( fileManager.volumeManager.unmount(volumeInfo, function() {}, errorCallback);
volumeInfo,
function() {},
errorCallback);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
...@@ -481,7 +478,7 @@ CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({ ...@@ -481,7 +478,7 @@ CommandHandler.COMMANDS_['unmount'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['format'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['format'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager The file manager instance. * @param {!CommandHandlerDeps} fileManager The file manager instance.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var directoryModel = fileManager.directoryModel; var directoryModel = fileManager.directoryModel;
...@@ -503,7 +500,7 @@ CommandHandler.COMMANDS_['format'] = /** @type {Command} */ ({ ...@@ -503,7 +500,7 @@ CommandHandler.COMMANDS_['format'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager The file manager instance. * @param {!CommandHandlerDeps} fileManager The file manager instance.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var directoryModel = fileManager.directoryModel; var directoryModel = fileManager.directoryModel;
...@@ -536,7 +533,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() { ...@@ -536,7 +533,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() {
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
NewFolderCommand.prototype.execute = function(event, fileManager) { NewFolderCommand.prototype.execute = function(event, fileManager) {
var targetDirectory; var targetDirectory;
...@@ -570,7 +567,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() { ...@@ -570,7 +567,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() {
if (executedFromDirectoryTree) { if (executedFromDirectoryTree) {
directoryTree.updateAndSelectNewDirectory( directoryTree.updateAndSelectNewDirectory(
targetDirectory, newDirectory); targetDirectory, newDirectory);
fileManager.getDirectoryTreeNamingController().attachAndStart( fileManager.directoryTreeNamingController.attachAndStart(
assert(fileManager.ui.directoryTree.selectedItem)); assert(fileManager.ui.directoryTree.selectedItem));
} else { } else {
directoryModel.updateAndSelectNewDirectory( directoryModel.updateAndSelectNewDirectory(
...@@ -618,7 +615,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() { ...@@ -618,7 +615,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() {
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
NewFolderCommand.prototype.canExecute = function(event, fileManager) { NewFolderCommand.prototype.canExecute = function(event, fileManager) {
if (event.target instanceof DirectoryItem || if (event.target instanceof DirectoryItem ||
...@@ -636,10 +633,9 @@ CommandHandler.COMMANDS_['new-folder'] = (function() { ...@@ -636,10 +633,9 @@ CommandHandler.COMMANDS_['new-folder'] = (function() {
CommandUtil.isRootEntry(fileManager.volumeManager, entry)); CommandUtil.isRootEntry(fileManager.volumeManager, entry));
} else { } else {
var directoryModel = fileManager.directoryModel; var directoryModel = fileManager.directoryModel;
event.canExecute = !fileManager.isOnReadonlyDirectory() && event.canExecute = !fileManager.directoryModel.isReadOnly() &&
!fileManager.namingController.isRenamingInProgress() && !fileManager.namingController.isRenamingInProgress() &&
!directoryModel.isSearching() && !directoryModel.isSearching() && !directoryModel.isScanning();
!directoryModel.isScanning();
event.command.setHidden(false); event.command.setHidden(false);
} }
}; };
...@@ -654,7 +650,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() { ...@@ -654,7 +650,7 @@ CommandHandler.COMMANDS_['new-folder'] = (function() {
CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.backgroundPage.launcher.launchFileManager({ fileManager.backgroundPage.launcher.launchFileManager({
...@@ -664,7 +660,7 @@ CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({ ...@@ -664,7 +660,7 @@ CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = event.canExecute =
...@@ -676,7 +672,7 @@ CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({ ...@@ -676,7 +672,7 @@ CommandHandler.COMMANDS_['new-window'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var isFilterHiddenOn = !fileManager.fileFilter.isFilterHiddenOn(); var isFilterHiddenOn = !fileManager.fileFilter.isFilterHiddenOn();
...@@ -685,7 +681,7 @@ CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({ ...@@ -685,7 +681,7 @@ CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: CommandUtil.canExecuteAlways canExecute: CommandUtil.canExecuteAlways
}); });
...@@ -697,7 +693,7 @@ CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({ ...@@ -697,7 +693,7 @@ CommandHandler.COMMANDS_['toggle-hidden-files'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
// If checked, the sync is disabled. // If checked, the sync is disabled.
...@@ -708,12 +704,12 @@ CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({ ...@@ -708,12 +704,12 @@ CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = fileManager.shouldShowDriveSettings() && event.canExecute = fileManager.directoryModel.isOnDrive() &&
fileManager.volumeManager.getDriveConnectionState(). fileManager.volumeManager.getDriveConnectionState()
hasCellularNetworkAccess; .hasCellularNetworkAccess;
event.command.setHidden(!event.canExecute); event.command.setHidden(!event.canExecute);
} }
}); });
...@@ -725,7 +721,7 @@ CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({ ...@@ -725,7 +721,7 @@ CommandHandler.COMMANDS_['drive-sync-settings'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['drive-hosted-settings'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['drive-hosted-settings'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
// If checked, showing drive hosted files is enabled. // If checked, showing drive hosted files is enabled.
...@@ -741,10 +737,10 @@ CommandHandler.COMMANDS_['drive-hosted-settings'] = /** @type {Command} */ ({ ...@@ -741,10 +737,10 @@ CommandHandler.COMMANDS_['drive-hosted-settings'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = fileManager.shouldShowDriveSettings(); event.canExecute = fileManager.directoryModel.isOnDrive();
event.command.setHidden(!event.canExecute); event.command.setHidden(!event.canExecute);
} }
}); });
...@@ -763,7 +759,7 @@ CommandHandler.COMMANDS_['delete'] = (function() { ...@@ -763,7 +759,7 @@ CommandHandler.COMMANDS_['delete'] = (function() {
DeleteCommand.prototype = { DeleteCommand.prototype = {
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -787,7 +783,7 @@ CommandHandler.COMMANDS_['delete'] = (function() { ...@@ -787,7 +783,7 @@ CommandHandler.COMMANDS_['delete'] = (function() {
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -807,7 +803,7 @@ CommandHandler.COMMANDS_['delete'] = (function() { ...@@ -807,7 +803,7 @@ CommandHandler.COMMANDS_['delete'] = (function() {
/** /**
* @param {!Array<!Entry>} entries * @param {!Array<!Entry>} entries
* @param {!FileManager} fileManager * @param {!CommandHandlerDeps} fileManager
* @return {boolean} True if entries contain read only entry. * @return {boolean} True if entries contain read only entry.
*/ */
containsReadOnlyEntry_: function(entries, fileManager) { containsReadOnlyEntry_: function(entries, fileManager) {
...@@ -828,14 +824,14 @@ CommandHandler.COMMANDS_['delete'] = (function() { ...@@ -828,14 +824,14 @@ CommandHandler.COMMANDS_['delete'] = (function() {
CommandHandler.COMMANDS_['paste'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['paste'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.document.execCommand(event.command.id); fileManager.document.execCommand(event.command.id);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var fileTransferController = fileManager.fileTransferController; var fileTransferController = fileManager.fileTransferController;
...@@ -857,7 +853,7 @@ CommandHandler.COMMANDS_['paste'] = /** @type {Command} */ ({ ...@@ -857,7 +853,7 @@ CommandHandler.COMMANDS_['paste'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['paste-into-folder'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['paste-into-folder'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -879,7 +875,7 @@ CommandHandler.COMMANDS_['paste-into-folder'] = /** @type {Command} */ ({ ...@@ -879,7 +875,7 @@ CommandHandler.COMMANDS_['paste-into-folder'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -911,24 +907,24 @@ CommandHandler.COMMANDS_['copy'] = CommandUtil.defaultCommand; ...@@ -911,24 +907,24 @@ CommandHandler.COMMANDS_['copy'] = CommandUtil.defaultCommand;
CommandHandler.COMMANDS_['rename'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['rename'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
if (event.target instanceof DirectoryTree) { if (event.target instanceof DirectoryTree) {
var directoryTree = event.target; var directoryTree = event.target;
assert(fileManager.getDirectoryTreeNamingController()).attachAndStart( assert(fileManager.directoryTreeNamingController)
assert(directoryTree.selectedItem)); .attachAndStart(assert(directoryTree.selectedItem));
} else if (event.target instanceof DirectoryItem) { } else if (event.target instanceof DirectoryItem) {
var directoryItem = event.target; var directoryItem = event.target;
assert(fileManager.getDirectoryTreeNamingController()).attachAndStart( assert(fileManager.directoryTreeNamingController)
directoryItem); .attachAndStart(directoryItem);
} else { } else {
fileManager.namingController.initiateRename(); fileManager.namingController.initiateRename();
} }
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -957,17 +953,17 @@ CommandHandler.COMMANDS_['rename'] = /** @type {Command} */ ({ ...@@ -957,17 +953,17 @@ CommandHandler.COMMANDS_['rename'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
if (fileManager.isOnDrive()) if (fileManager.directoryModel.isOnDrive())
util.visitURL(str('GOOGLE_DRIVE_HELP_URL')); util.visitURL(str('GOOGLE_DRIVE_HELP_URL'));
else else
util.visitURL(str('FILES_APP_HELP_URL')); util.visitURL(str('FILES_APP_HELP_URL'));
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
// Hides the help menu in modal dialog mode. It does not make much sense // Hides the help menu in modal dialog mode. It does not make much sense
...@@ -978,7 +974,7 @@ CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({ ...@@ -978,7 +974,7 @@ CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({
var hideHelp = DialogType.isModal(fileManager.dialogType); var hideHelp = DialogType.isModal(fileManager.dialogType);
event.canExecute = !hideHelp; event.canExecute = !hideHelp;
event.command.setHidden(hideHelp); event.command.setHidden(hideHelp);
fileManager.document_.getElementById('help-separator').hidden = hideHelp; fileManager.document.getElementById('help-separator').hidden = hideHelp;
} }
}); });
...@@ -989,7 +985,7 @@ CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({ ...@@ -989,7 +985,7 @@ CommandHandler.COMMANDS_['volume-help'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['drive-buy-more-space'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['drive-buy-more-space'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
util.visitURL(str('GOOGLE_DRIVE_BUY_STORAGE_URL')); util.visitURL(str('GOOGLE_DRIVE_BUY_STORAGE_URL'));
...@@ -1004,7 +1000,7 @@ CommandHandler.COMMANDS_['drive-buy-more-space'] = /** @type {Command} */ ({ ...@@ -1004,7 +1000,7 @@ CommandHandler.COMMANDS_['drive-buy-more-space'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['drive-go-to-drive'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['drive-go-to-drive'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
util.visitURL(str('GOOGLE_DRIVE_ROOT_URL')); util.visitURL(str('GOOGLE_DRIVE_ROOT_URL'));
...@@ -1034,7 +1030,7 @@ CommandHandler.COMMANDS_['default-task'] = /** @type {Command} */ ({ ...@@ -1034,7 +1030,7 @@ CommandHandler.COMMANDS_['default-task'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.taskController.getFileTasks().then(function(tasks) { fileManager.taskController.getFileTasks().then(function(tasks) {
...@@ -1053,7 +1049,7 @@ CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({ ...@@ -1053,7 +1049,7 @@ CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var canExecute = fileManager.taskController.canExecuteMoreActions(); var canExecute = fileManager.taskController.canExecuteMoreActions();
...@@ -1069,7 +1065,7 @@ CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({ ...@@ -1069,7 +1065,7 @@ CommandHandler.COMMANDS_['open-with'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager fileManager to use. * @param {!CommandHandlerDeps} fileManager fileManager to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
// 'get-info' command is executed by 'command' event handler in // 'get-info' command is executed by 'command' event handler in
...@@ -1077,7 +1073,7 @@ CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({ ...@@ -1077,7 +1073,7 @@ CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var entries = CommandUtil.getCommandEntries(event.target); var entries = CommandUtil.getCommandEntries(event.target);
...@@ -1099,7 +1095,7 @@ CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({ ...@@ -1099,7 +1095,7 @@ CommandHandler.COMMANDS_['get-info'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['search'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['search'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
// Cancel item selection. // Cancel item selection.
...@@ -1112,7 +1108,7 @@ CommandHandler.COMMANDS_['search'] = /** @type {Command} */ ({ ...@@ -1112,7 +1108,7 @@ CommandHandler.COMMANDS_['search'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = !fileManager.namingController.isRenamingInProgress(); event.canExecute = !fileManager.namingController.isRenamingInProgress();
...@@ -1149,7 +1145,7 @@ CommandHandler.COMMANDS_['volume-switch-9'] = ...@@ -1149,7 +1145,7 @@ CommandHandler.COMMANDS_['volume-switch-9'] =
CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event * @param {!Event} event
* @param {!FileManager} fileManager * @param {!CommandHandlerDeps} fileManager
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1166,7 +1162,7 @@ CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({ ...@@ -1166,7 +1162,7 @@ CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1194,29 +1190,27 @@ CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({ ...@@ -1194,29 +1190,27 @@ CommandHandler.COMMANDS_['toggle-pinned'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['zip-selection'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['zip-selection'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var dirEntry = fileManager.getCurrentDirectoryEntry(); var dirEntry = fileManager.getCurrentDirectoryEntry();
if (!dirEntry) if (!dirEntry)
return; return;
var selectionEntries = fileManager.getSelection().entries; var selectionEntries = fileManager.getSelection().entries;
fileManager.fileOperationManager_.zipSelection( fileManager.fileOperationManager.zipSelection(
/** @type {!DirectoryEntry} */ (dirEntry), selectionEntries); /** @type {!DirectoryEntry} */ (dirEntry), selectionEntries);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var dirEntry = fileManager.getCurrentDirectoryEntry(); var dirEntry = fileManager.getCurrentDirectoryEntry();
var selection = fileManager.getSelection(); var selection = fileManager.getSelection();
event.canExecute = event.canExecute = dirEntry && !fileManager.directoryModel.isReadOnly() &&
dirEntry && !fileManager.directoryModel.isOnDrive() &&
!fileManager.isOnReadonlyDirectory() && !fileManager.directoryModel.isOnMTP() && selection &&
!fileManager.isOnDrive() && selection.totalCount > 0;
!fileManager.isOnMTP() &&
selection && selection.totalCount > 0;
} }
}); });
...@@ -1227,7 +1221,7 @@ CommandHandler.COMMANDS_['zip-selection'] = /** @type {Command} */ ({ ...@@ -1227,7 +1221,7 @@ CommandHandler.COMMANDS_['zip-selection'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
// To toolbar buttons are always related to the file list, even though the // To toolbar buttons are always related to the file list, even though the
...@@ -1242,7 +1236,7 @@ CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({ ...@@ -1242,7 +1236,7 @@ CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelForContext( var actionsModel = fileManager.actionsController.getActionsModelForContext(
...@@ -1264,7 +1258,7 @@ CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({ ...@@ -1264,7 +1258,7 @@ CommandHandler.COMMANDS_['share'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager The file manager instance. * @param {!CommandHandlerDeps} fileManager The file manager instance.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1276,7 +1270,7 @@ CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({ ...@@ -1276,7 +1270,7 @@ CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1296,7 +1290,7 @@ CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({ ...@@ -1296,7 +1290,7 @@ CommandHandler.COMMANDS_['create-folder-shortcut'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager The file manager instance. * @param {!CommandHandlerDeps} fileManager The file manager instance.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1308,7 +1302,7 @@ CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({ ...@@ -1308,7 +1302,7 @@ CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
var actionsModel = fileManager.actionsController.getActionsModelFor( var actionsModel = fileManager.actionsController.getActionsModelFor(
...@@ -1328,7 +1322,7 @@ CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({ ...@@ -1328,7 +1322,7 @@ CommandHandler.COMMANDS_['remove-folder-shortcut'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['zoom-in'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['zoom-in'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.zoom('in'); chrome.fileManagerPrivate.zoom('in');
...@@ -1343,7 +1337,7 @@ CommandHandler.COMMANDS_['zoom-in'] = /** @type {Command} */ ({ ...@@ -1343,7 +1337,7 @@ CommandHandler.COMMANDS_['zoom-in'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['zoom-out'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['zoom-out'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.zoom('out'); chrome.fileManagerPrivate.zoom('out');
...@@ -1358,7 +1352,7 @@ CommandHandler.COMMANDS_['zoom-out'] = /** @type {Command} */ ({ ...@@ -1358,7 +1352,7 @@ CommandHandler.COMMANDS_['zoom-out'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['zoom-reset'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['zoom-reset'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.zoom('reset'); chrome.fileManagerPrivate.zoom('reset');
...@@ -1421,7 +1415,7 @@ CommandHandler.COMMANDS_['sort-by-date'] = /** @type {Command} */ ({ ...@@ -1421,7 +1415,7 @@ CommandHandler.COMMANDS_['sort-by-date'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['inspect-normal'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['inspect-normal'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.openInspector('normal'); chrome.fileManagerPrivate.openInspector('normal');
...@@ -1436,7 +1430,7 @@ CommandHandler.COMMANDS_['inspect-normal'] = /** @type {Command} */ ({ ...@@ -1436,7 +1430,7 @@ CommandHandler.COMMANDS_['inspect-normal'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['inspect-console'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['inspect-console'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.openInspector('console'); chrome.fileManagerPrivate.openInspector('console');
...@@ -1451,7 +1445,7 @@ CommandHandler.COMMANDS_['inspect-console'] = /** @type {Command} */ ({ ...@@ -1451,7 +1445,7 @@ CommandHandler.COMMANDS_['inspect-console'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['inspect-element'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['inspect-element'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.openInspector('element'); chrome.fileManagerPrivate.openInspector('element');
...@@ -1466,7 +1460,7 @@ CommandHandler.COMMANDS_['inspect-element'] = /** @type {Command} */ ({ ...@@ -1466,7 +1460,7 @@ CommandHandler.COMMANDS_['inspect-element'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['inspect-background'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['inspect-background'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
chrome.fileManagerPrivate.openInspector('background'); chrome.fileManagerPrivate.openInspector('background');
...@@ -1481,7 +1475,7 @@ CommandHandler.COMMANDS_['inspect-background'] = /** @type {Command} */ ({ ...@@ -1481,7 +1475,7 @@ CommandHandler.COMMANDS_['inspect-background'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['install-new-extension'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['install-new-extension'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.ui.suggestAppsDialog.showProviders( fileManager.ui.suggestAppsDialog.showProviders(
...@@ -1505,14 +1499,14 @@ CommandHandler.COMMANDS_['install-new-extension'] = /** @type {Command} */ ({ ...@@ -1505,14 +1499,14 @@ CommandHandler.COMMANDS_['install-new-extension'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['open-gear-menu'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['open-gear-menu'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.ui.gearButton.showMenu(true); fileManager.ui.gearButton.showMenu(true);
}, },
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
canExecute: function(event, fileManager) { canExecute: function(event, fileManager) {
event.canExecute = CommandUtil.canExecuteAlways; event.canExecute = CommandUtil.canExecuteAlways;
...@@ -1525,7 +1519,7 @@ CommandHandler.COMMANDS_['open-gear-menu'] = /** @type {Command} */ ({ ...@@ -1525,7 +1519,7 @@ CommandHandler.COMMANDS_['open-gear-menu'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['configure'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['configure'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var volumeInfo = var volumeInfo =
...@@ -1549,7 +1543,7 @@ CommandHandler.COMMANDS_['configure'] = /** @type {Command} */ ({ ...@@ -1549,7 +1543,7 @@ CommandHandler.COMMANDS_['configure'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['refresh'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['refresh'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
fileManager.directoryModel.rescan(true /* refresh */); fileManager.directoryModel.rescan(true /* refresh */);
...@@ -1571,7 +1565,7 @@ CommandHandler.COMMANDS_['refresh'] = /** @type {Command} */ ({ ...@@ -1571,7 +1565,7 @@ CommandHandler.COMMANDS_['refresh'] = /** @type {Command} */ ({
CommandHandler.COMMANDS_['set-wallpaper'] = /** @type {Command} */ ({ CommandHandler.COMMANDS_['set-wallpaper'] = /** @type {Command} */ ({
/** /**
* @param {!Event} event Command event. * @param {!Event} event Command event.
* @param {!FileManager} fileManager FileManager to use. * @param {!CommandHandlerDeps} fileManager CommandHandlerDeps to use.
*/ */
execute: function(event, fileManager) { execute: function(event, fileManager) {
var entry = fileManager.getSelection().entries[0]; var entry = fileManager.getSelection().entries[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment