Merge navigation list and directory tree.

ui/file_manager/file_manager/foreground/js/file_manager_commands.js

Index: ui/file_manager/file_manager/foreground/js/file_manager_commands.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
index 275fa959f311375a1b35422cb6b45686f92b3703..ae735eecad925d9247458e6ef96ec42989ed1c85 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
@@ -41,30 +41,18 @@ var CommandUtil = {};
 /**
  * Extracts entry on which command event was dispatched.
  *
- * @param {DirectoryTree|DirectoryItem|NavigationList|HTMLLIElement|cr.ui.List}
+ * @param {DirectoryTree|DirectoryItem|HTMLLIElement|cr.ui.List}
  *     element Directory to extract a path from.
  * @return {Entry} Entry of the found node.
  */
 CommandUtil.getCommandEntry = function(element) {
-  if (element instanceof NavigationList) {
-    // element is a NavigationList.
-    /** @type {NavigationModelItem} */
-    var item = element.selectedItem;
-    return element.selectedItem &&
-        CommandUtil.getEntryFromNavigationModelItem_(item);
-  } else if (element instanceof NavigationListItem) {
-    // element is a subitem of NavigationList.
-    /** @type {NavigationList} */
-    var navigationList = element.parentElement;
-    var index = navigationList.getIndexOfListItem(element);
-    /** @type {NavigationModelItem} */
-    var item = (index != -1) ? navigationList.dataModel.item(index) : null;
-    return item && CommandUtil.getEntryFromNavigationModelItem_(item);
-  } else if (element instanceof DirectoryTree) {
+  if (element instanceof DirectoryTree) {
     // element is a DirectoryTree.
-    return element.selectedItem.entry;
-  } else if (element instanceof DirectoryItem) {
-    // element is a sub item in DirectoryTree.
+    return element.selectedItem ? element.selectedItem.entry : null;
+  } else if (element instanceof DirectoryItem ||
+             element instanceof VolumeItem ||
+             element instanceof ShortcutItem) {
+    // element are sub items in DirectoryTree.

[yoshiki, 2014/08/07 04:16:02]

I think the original comment (element is a sub item in DirectoryTree.) is
correct.

[fukino, 2014/08/07 09:43:37]

Yes! I was wrong... I'll correct this comment in next CL.

     return element.entry;
   } else if (element instanceof cr.ui.List) {
     // element is a normal List (eg. the file list on the right panel).
@@ -214,11 +202,11 @@ CommandUtil.defaultCommand = {
 CommandUtil.createVolumeSwitchCommand = function(index) {
   return {
     execute: function(event, fileManager) {
-      fileManager.navigationList.selectByIndex(index - 1);
+      fileManager.directoryTree.selectByIndex(index - 1);
     },
     canExecute: function(event, fileManager) {
       event.canExecute = index > 0 &&
-          index <= fileManager.navigationList.dataModel.length;
+          index <= fileManager.directoryTree.items.length;
     }
   };
 };
@@ -834,8 +822,7 @@ CommandHandler.COMMANDS_['create-folder-shortcut'] = {
     var onlyOneFolderSelected = true;
     // Only on list, user can select multiple files. The command is enabled only
     // when a single file is selected.
-    if (event.target instanceof cr.ui.List &&
-        !(event.target instanceof NavigationList)) {
+    if (event.target instanceof cr.ui.List) {
       var items = event.target.selectedItems;
       onlyOneFolderSelected = (items.length == 1 && items[0].isDirectory);
     }