Show the USB icon for external media roots in Computers.

Bug: 884020
Change-Id: I056a5a830c8ca5821d6ca3338372ee27702c0ff9
Reviewed-on: https://chromium-review.googlesource.com/c/1355308
Commit-Queue: Stuart Langley <slangley@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#613421}(cherry picked from commit adefd8b)
Reviewed-on: https://chromium-review.googlesource.com/c/1362487
Reviewed-by: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#64}
Cr-Branched-From: d897fb1-refs/heads/master@{#612437}

Author: sjlangley

chrome/common/extensions/api/file_manager_private.idl

@@ -184,7 +184,10 @@ enum EntryPropertyName {
   canDelete,
   canRename,
   canAddChildren,
-  canShare
+  canShare,
+  isMachineRoot,
+  isExternalMedia,
+  isArbitrarySyncFolder
 };
 
 // Entry property visibility for setEntryTag();

ui/file_manager/base/js/volume_manager_types.js

@@ -113,6 +113,9 @@ VolumeManagerCommon.RootType = {
 
   // Root directory of a Computer.
   COMPUTER: 'computer',
+
+  // Root directory of an external media folder under computers grand root.
+  EXTERNAL_MEDIA: 'external_media',
 };
 Object.freeze(VolumeManagerCommon.RootType);
 
@@ -146,6 +149,7 @@ VolumeManagerCommon.RootTypesForUMA = [
   VolumeManagerCommon.RootType.MY_FILES,
   VolumeManagerCommon.RootType.COMPUTERS_GRAND_ROOT,
   VolumeManagerCommon.RootType.COMPUTER,
+  VolumeManagerCommon.RootType.EXTERNAL_MEDIA,
 ];
 console.assert(
     Object.keys(VolumeManagerCommon.RootType).length ===
@@ -282,6 +286,7 @@ VolumeManagerCommon.getVolumeTypeFromRootType = function(rootType) {
     case VolumeManagerCommon.RootType.COMPUTERS_GRAND_ROOT:
     case VolumeManagerCommon.RootType.COMPUTER:
     case VolumeManagerCommon.RootType.DRIVE_FAKE_ROOT:
+    case VolumeManagerCommon.RootType.EXTERNAL_MEDIA:
       return VolumeManagerCommon.VolumeType.DRIVE;
     case VolumeManagerCommon.RootType.MTP:
       return VolumeManagerCommon.VolumeType.MTP;

ui/file_manager/file_manager/foreground/css/file_types.css

@@ -362,6 +362,7 @@ tree .tree-item[selected] > .tree-row >
 }
 
 .external-media-root[file-type-icon='folder'],
+[volume-type-icon='external_media'],
 [volume-type-icon='removable'] {
   background-image: -webkit-image-set(
       url(../images/volumes/usb.png) 1x,
@@ -370,6 +371,7 @@ tree .tree-item[selected] > .tree-row >
 
 tree .tree-item[selected] > .tree-row >
 .external-media-root[file-type-icon='folder'],
+.tree-row[selected] [volume-type-icon='external_media'],
 .tree-row[selected] [volume-type-icon='removable'] {
   background-image: -webkit-image-set(
       url(../images/volumes/usb_active.png) 1x,

ui/file_manager/file_manager/foreground/js/constants.js

@@ -47,9 +47,22 @@ constants.FILE_SELECTION_METADATA_PREFETCH_PROPERTY_NAMES = [
  * @const {!Array<string>}
  */
 constants.LIST_CONTAINER_METADATA_PREFETCH_PROPERTY_NAMES = [
-  'availableOffline', 'contentMimeType', 'customIconUrl', 'hosted',
-  'modificationTime', 'modificationByMeTime', 'shared', 'size', 'canCopy',
-  'canDelete', 'canRename', 'canAddChildren', 'canShare'
+  'availableOffline',
+  'contentMimeType',
+  'customIconUrl',
+  'hosted',
+  'modificationTime',
+  'modificationByMeTime',
+  'shared',
+  'size',
+  'canCopy',
+  'canDelete',
+  'canRename',
+  'canAddChildren',
+  'canShare',
+  'isMachineRoot',
+  'isExternalMedia',
+  'isArbitrarySyncFolder',
 ];
 
 /**
@@ -62,4 +75,4 @@ constants.FILES_QUICK_VIEW_HTML = 'foreground/elements/files_quick_view.html';
  * Path for drive_welcome.css file.  Allow override for testing.
  * @type {string}
  */
-constants.DRIVE_WELCOME_CSS = 'foreground/css/drive_welcome.css';
+constants.DRIVE_WELCOME_CSS = 'foreground/css/drive_welcome.css';

ui/file_manager/file_manager/foreground/js/ui/directory_tree.js

@@ -237,6 +237,22 @@ DirectoryItem.prototype = {
         locationInfo.rootType === VolumeManagerCommon.RootType.DRIVE;
   },
 
+  /**
+   * Returns true if this item is inside any part of Computers.
+   * @type {!boolean}
+   */
+  get insideComputers() {
+    if (!this.entry)
+      return false;
+
+    const locationInfo =
+        this.parentTree_.volumeManager.getLocationInfo(this.entry);
+    return locationInfo &&
+        (locationInfo.rootType ===
+             VolumeManagerCommon.RootType.COMPUTERS_GRAND_ROOT ||
+         locationInfo.rootType === VolumeManagerCommon.RootType.COMPUTER);
+  },
+
   /**
    * Returns true if this item is inside any part of Drive, including Team
    * Drive.
@@ -269,8 +285,8 @@ DirectoryItem.prototype = {
    * support it.
    * @type {!boolean}
    */
-  get supportsSharedFeature() {
-    return this.insideMyDrive;
+  get supportDriveSpecificIcons() {
+    return this.insideMyDrive || this.insideComputers;
   },
 };
 
@@ -280,7 +296,11 @@ DirectoryItem.prototype = {
  * @param {Event} event Metadata update event.
  */
 DirectoryItem.prototype.onMetadataUpdated_ = function(event) {
-  if (!(event.names.has('shared') && this.supportsSharedFeature))
+  if (!this.supportDriveSpecificIcons)
+    return;
+
+  const updateableProperties = ['shared', 'isMachineRoot', 'isExternalMedia'];
+  if (!updateableProperties.some((prop) => event.names.has(prop)))
     return;
 
   let index = 0;
@@ -289,7 +309,7 @@ DirectoryItem.prototype.onMetadataUpdated_ = function(event) {
     const childElement = this.items[index];
 
     if (event.entriesMap.has(childEntry.toURL()))
-      childElement.updateSharedStatusIcon();
+      childElement.updateDriveSpecificIcons();
 
     index++;
   }
@@ -328,7 +348,7 @@ DirectoryItem.prototype.updateSubElementsFromList = function(recursive) {
       this.add(item);
       index++;
     } else if (util.isSameEntry(currentEntry, currentElement.entry)) {
-      currentElement.updateSharedStatusIcon();
+      currentElement.updateDriveSpecificIcons();
       if (recursive && this.expanded) {
         if (this.delayExpansion) {
           // Only update deeper on expanded children.
@@ -430,7 +450,7 @@ DirectoryItem.prototype.clearHasChildren = function() {
  * @private
  */
 DirectoryItem.prototype.onExpand_ = function(e) {
-  if (this.supportsSharedFeature && !this.onMetadataUpdateBound_) {
+  if (this.supportDriveSpecificIcons && !this.onMetadataUpdateBound_) {
     this.onMetadataUpdateBound_ = this.onMetadataUpdated_.bind(this);
     this.parentTree_.metadataModel_.addEventListener(
         'update', this.onMetadataUpdateBound_);
@@ -581,7 +601,7 @@ DirectoryItem.prototype.updateItemByEntry = function(changedDirectoryEntry) {
 /**
  * Update the icon based on whether the folder is shared on Drive.
  */
-DirectoryItem.prototype.updateSharedStatusIcon = function() {};
+DirectoryItem.prototype.updateDriveSpecificIcons = function() {};
 
 /**
  * Select the item corresponding to the given {@code entry}.
@@ -665,7 +685,7 @@ function SubDirectoryItem(label, dirEntry, parentDirItem, tree) {
     if (iconOverride)
       icon.setAttribute('volume-type-icon', iconOverride);
     icon.setAttribute('file-type-icon', iconOverride || 'folder');
-    item.updateSharedStatusIcon();
+    item.updateDriveSpecificIcons();
   }
 
   // Sets up context menu of the item.
@@ -699,11 +719,17 @@ SubDirectoryItem.prototype = {
  * Update the icon based on whether the folder is shared on Drive.
  * @override
  */
-SubDirectoryItem.prototype.updateSharedStatusIcon = function() {
+SubDirectoryItem.prototype.updateDriveSpecificIcons = function() {
   const icon = this.querySelector('.icon');
-  const metadata =
-      this.parentTree_.metadataModel.getCache([this.dirEntry_], ['shared']);
+  const metadata = this.parentTree_.metadataModel.getCache(
+      [this.dirEntry_], ['shared', 'isMachineRoot', 'isExternalMedia']);
   icon.classList.toggle('shared', !!(metadata[0] && metadata[0].shared));
+  if (metadata[0] && metadata[0].isMachineRoot)
+    icon.setAttribute(
+        'volume-type-icon', VolumeManagerCommon.RootType.COMPUTER);
+  if (metadata[0] && metadata[0].isExternalMedia)
+    icon.setAttribute(
+        'volume-type-icon', VolumeManagerCommon.RootType.EXTERNAL_MEDIA);
 };
 
 /**
@@ -1605,7 +1631,7 @@ FakeItem.prototype.updateSubDirectories = function(
 /**
  * FakeItem doesn't really have shared status/icon so we define here as no-op.
  */
-FakeItem.prototype.updateSharedStatusIcon = function() {};
+FakeItem.prototype.updateDriveSpecificIcons = function() {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // DirectoryTree