Revert of Add button to add new FSP services to Files app.

ui/file_manager/file_manager/foreground/js/navigation_list_model.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.
 
 /**
  * Base item of NavigationListModel. Should not be created directly.
  * @param {string} label Label.
  * @constructor
  */
 function NavigationModelItem(label) {
   this.label_ = label;
 }
 
-NavigationModelItem.Type = {
-  SHORTCUT: 'shortcut',
-  VOLUME: 'volume',
-  COMMAND: 'command'
-};
-
 NavigationModelItem.prototype = {
   get label() { return this.label_; }
 };
 
 /**
+ * Check whether given two model items are same.
+ * @param {NavigationModelItem} item1 The first item to be compared.
+ * @param {NavigationModelItem} item2 The second item to be compared.
+ * @return {boolean} True if given two model items are same.
+ */
+NavigationModelItem.isSame = function(item1, item2) {
+  if (item1.isVolume != item2.isVolume)
+    return false;
+
+  if (item1.isVolume)
+    return item1.volumeInfo === item2.volumeInfo;
+  else
+    return util.isSameEntry(item1.entry, item2.entry);
+};
+
+/**
  * Item of NavigationListModel for shortcuts.
  *
  * @param {string} label Label.
  * @param {!DirectoryEntry} entry Entry. Cannot be null.
  * @constructor
  * @extends {NavigationModelItem}
- * @struct
  */
 function NavigationModelShortcutItem(label, entry) {
   NavigationModelItem.call(this, label);
   this.entry_ = entry;
+  Object.freeze(this);
 }
 
 NavigationModelShortcutItem.prototype = {
   __proto__: NavigationModelItem.prototype,
   get entry() { return this.entry_; },
-  get type() { return NavigationModelItem.Type.SHORTCUT; }
+  get isVolume() { return false; },
+  get isShortcut() { return true; }
 };
 
 /**
  * Item of NavigationListModel for volumes.
  *
  * @param {string} label Label.
  * @param {!VolumeInfo} volumeInfo Volume info for the volume. Cannot be null.
  * @constructor
  * @extends {NavigationModelItem}
- * @struct
  */
 function NavigationModelVolumeItem(label, volumeInfo) {
   NavigationModelItem.call(this, label);
   this.volumeInfo_ = volumeInfo;
   // Start resolving the display root because it is used
   // for determining executability of commands.
   this.volumeInfo_.resolveDisplayRoot(
       function() {}, function() {});
+  Object.freeze(this);
 }
 
 NavigationModelVolumeItem.prototype = {
   __proto__: NavigationModelItem.prototype,
   get volumeInfo() { return this.volumeInfo_; },
-  get type() { return NavigationModelItem.Type.VOLUME; }
+  get isVolume() { return true; },
+  get isShortcut() { return false; }
 };
 
 /**
- * Item of NavigationListModel for commands.
- *
- * @param {cr.ui.Command} command
- * @constructor
- * @extends {NavigationModelItem}
- * @struct
- */
-function NavigationModelCommandItem(command) {
-  NavigationModelItem.call(this, command.label);
-  this.command_ = command;
-}
-
-NavigationModelCommandItem.prototype = {
-  __proto__: NavigationModelItem.prototype,
-  get command() { return this.command_; },
-  get type() { return NavigationModelItem.Type.COMMAND; }
-};
-
-/**
- * A navigation list model. This model combines multiple models.
+ * A navigation list model. This model combines the 2 lists.
  * @param {VolumeManagerWrapper} volumeManager VolumeManagerWrapper instance.
  * @param {(cr.ui.ArrayDataModel|FolderShortcutsDataModel)} shortcutListModel
  *     The list of folder shortcut.
- * @param {NavigationModelCommandItem} commandModel, Command button at the
- *     end of the list.
  * @constructor
  * @extends {cr.EventTarget}
  */
-function NavigationListModel(volumeManager, shortcutListModel, commandModel) {
+function NavigationListModel(volumeManager, shortcutListModel) {
   cr.EventTarget.call(this);
 
   this.volumeManager_ = volumeManager;
   this.shortcutListModel_ = shortcutListModel;
-  this.commandModel_ = commandModel;
 
   var volumeInfoToModelItem = function(volumeInfo) {
     return new NavigationModelVolumeItem(
         volumeInfo.label,
         volumeInfo);
   }.bind(this);
 
   var entryToModelItem = function(entry) {
     var item = new NavigationModelShortcutItem(
         entry.name,
@@ skipping 132 matching lines @@
   get length() { return this.length_(); },
   get folderShortcutList() { return this.shortcutList_; }
 };
 
 /**
  * Returns the item at the given index.
  * @param {number} index The index of the entry to get.
  * @return {NavigationModelItem} The item at the given index.
  */
 NavigationListModel.prototype.item = function(index) {
-  if (index < this.volumeList_.length)
+  var offset = this.volumeList_.length;
+  if (index < offset)
     return this.volumeList_[index];
-  if (index < this.volumeList_.length + this.shortcutList_.length)
-    return this.shortcutList_[index - this.volumeList_.length];
-  if (index === this.length_() - 1)
-    return this.commandModel_;
+  return this.shortcutList_[index - offset];
 };
 
 /**
  * Returns the number of items in the model.
  * @return {number} The length of the model.
  * @private
  */
 NavigationListModel.prototype.length_ = function() {
-  return this.volumeList_.length + this.shortcutList_.length +
-      (this.commandModel_ ? 1 : 0);
+  return this.volumeList_.length + this.shortcutList_.length;
 };
 
 /**
  * Returns the first matching item.
  * @param {NavigationModelItem} modelItem The entry to find.
  * @param {number=} opt_fromIndex If provided, then the searching start at
  *     the {@code opt_fromIndex}.
  * @return {number} The index of the first found element or -1 if not found.
  */
 NavigationListModel.prototype.indexOf = function(modelItem, opt_fromIndex) {
   for (var i = opt_fromIndex || 0; i < this.length; i++) {
     if (modelItem === this.item(i))
       return i;
   }
   return -1;
 };
 
 /**
  * Called externally when one of the items is not found on the filesystem.
  * @param {NavigationModelItem} modelItem The entry which is not found.
  */
 NavigationListModel.prototype.onItemNotFoundError = function(modelItem) {
-  if (modelItem.type ===  NavigationModelItem.Type.SHORTCUT)
+  if (modelItem.isVolume) {
+    // TODO(mtomasz, yoshiki): Implement when needed.
+    return;
+  }
+  if (modelItem.isShortcut) {
+    // For shortcuts, lets the shortcut model handle this situation.
     this.shortcutListModel_.onItemNotFoundError(modelItem.entry);
+  }
 };