[Files.app] Remove CommandUtil.getCommandPath()

chrome/browser/resources/file_manager/js/file_manager_commands.js

 // Copyright (c) 2012 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.
 
 'use strict';
 
 var CommandUtil = {};
 
 /**
  * Extracts entry on which command event was dispatched.
@@ skipping 30 matching lines @@
     // element is a normal List (eg. the file list on the right panel).
     var entry = element.selectedItem;
     return entry;
   } else {
     console.warn('Unsupported element');
     return null;
   }
 };
 
 /**
- * Extracts path on which command event was dispatched.
- * TODO(yoshiki): Remove this method after adding automatically removing an
- *                inactive shortcut on M31.
- *
- * @param {NavigationList|NavigationListItem} element Directory to extract a
- *     path from.
- * @return {string} Path of the found node.
- */
-CommandUtil.getCommandPath = function(element) {
-  if (element instanceof NavigationList) {
-    // element is a NavigationList.
-
-    /** @type {NavigationModelItem} */
-    var selectedItem = element.selectedItem;
-    return selectedItem && selectedItem.path;
-  } 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 && item.path;
-  }
-
-  console.error('Unsupported element.');
-};
-
-/**
  * @param {NavigationList} navigationList navigation list to extract root node.
  * @return {?RootType} Type of the found root.
  */
 CommandUtil.getCommandRootType = function(navigationList) {
   var root = CommandUtil.getCommandEntry(navigationList);
   return root &&
          PathUtil.isRootPath(root.fullPath) &&
          PathUtil.getRootType(root.fullPath);
 };
 
@@ skipping 549 matching lines @@
 /**
  * Removes the folder shortcut.
  */
 Commands.removeFolderShortcutCommand = {
   /**
    * @param {Event} event Command event.
    * @param {FileManager} fileManager The file manager instance.
    */
   execute: function(event, fileManager) {
     var entry = CommandUtil.getCommandEntry(event.target);
-    var path =
-        entry ? entry.fullPath : CommandUtil.getCommandPath(event.target);
-    if (path)
-      fileManager.removeFolderShortcut(path);
+    if (entry && entry.fullPath)
+      fileManager.removeFolderShortcut(entry.fullPath);
   },
 
   /**
    * @param {Event} event Command event.
    * @param {FileManager} fileManager The file manager instance.
    */
   canExecute: function(event, fileManager) {
     var target = event.target;
     if (!target instanceof NavigationListItem &&
         !target instanceof DirectoryItem) {
       event.command.setHidden(true);
       return;
     }
 
     var entry = CommandUtil.getCommandEntry(target);
-    var path =
-        entry ? entry.fullPath : CommandUtil.getCommandPath(event.target);
+    var path = entry && entry.fullPath;
 
     var eligible = path && PathUtil.isEligibleForFolderShortcut(path);
     var isShortcut = path && fileManager.folderShortcutExists(path);
     event.canExecute = isShortcut && eligible;
     event.command.setHidden(!event.canExecute);
   }
 };
 
 /**
  * Zoom in to the Files.app.
@@ skipping 17 matching lines @@
 
 /**
  * Reset the zoom factor.
  */
 Commands.zoomResetCommand = {
   execute: function(event) {
     chrome.fileBrowserPrivate.zoom('reset');
   },
   canExecute: CommandUtil.canExecuteAlways
 };