Change dialog texts for folder upload to explicitly indicate it's for 'Uploading'

chrome/browser/resources/file_manager/js/file_manager.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';
 
 /**
  * This variable is checked in SelectFileDialogExtensionBrowserTest.
  * @type {number}
  */
@@ skipping 44 matching lines @@
 /**
  * List of dialog types.
  *
  * Keep this in sync with FileManagerDialog::GetDialogTypeAsString, except
  * FULL_PAGE which is specific to this code.
  *
  * @enum {string}
  */
 var DialogType = {
   SELECT_FOLDER: 'folder',
+  SELECT_UPLOAD_FOLDER: 'upload-folder',
   SELECT_SAVEAS_FILE: 'saveas-file',
   SELECT_OPEN_FILE: 'open-file',
   SELECT_OPEN_MULTI_FILE: 'open-multi-file',
   FULL_PAGE: 'full-page'
 };
 
 /**
  * TextMeasure constructor.
  *
  * TextMeasure is a measure for text that returns the width of text.  This
@@ skipping 36 matching lines @@
   var rect = this.dummySpan_.getBoundingClientRect();
   return rect ? rect.width : 0;
 };
 
 /**
  * @param {string} type Dialog type.
  * @return {boolean} Whether the type is modal.
  */
 DialogType.isModal = function(type) {
   return type == DialogType.SELECT_FOLDER ||
+      type == DialogType.SELECT_UPLOAD_FOLDER ||
       type == DialogType.SELECT_SAVEAS_FILE ||
       type == DialogType.SELECT_OPEN_FILE ||
       type == DialogType.SELECT_OPEN_MULTI_FILE;
 };
 
 /**
  * Bottom magrin of the list and tree for transparent preview panel.
  * @const
  */
 var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
@@ skipping 622 matching lines @@
     this.dialogType = this.params_.type || DialogType.FULL_PAGE;
     this.startupPrefName_ = 'file-manager-' + this.dialogType;
 
     // Used to filter out focusing by mouse.
     this.suppressFocus_ = false;
 
     // Optional list of file types.
     this.fileTypes_ = this.params_.typeList || [];
     metrics.recordEnum('Create', this.dialogType,
         [DialogType.SELECT_FOLDER,
+         DialogType.SELECT_UPLOAD_FOLDER,
          DialogType.SELECT_SAVEAS_FILE,
          DialogType.SELECT_OPEN_FILE,
          DialogType.SELECT_OPEN_MULTI_FILE,
          DialogType.FULL_PAGE]);
 
     this.selectionHandler_ = null;
     this.ctrlKeyPressed_ = false;
 
     this.metadataCache_ = MetadataCache.createFull();
 
@@ skipping 271 matching lines @@
   FileManager.prototype.initFileList_ = function() {
     // Always sharing the data model between the detail/thumb views confuses
     // them.  Instead we maintain this bogus data model, and hook it up to the
     // view that is not in use.
     this.emptyDataModel_ = new cr.ui.ArrayDataModel([]);
     this.emptySelectionModel_ = new cr.ui.ListSelectionModel();
 
     var singleSelection =
         this.dialogType == DialogType.SELECT_OPEN_FILE ||
         this.dialogType == DialogType.SELECT_FOLDER ||
+        this.dialogType == DialogType.SELECT_UPLOAD_FOLDER ||
         this.dialogType == DialogType.SELECT_SAVEAS_FILE;
 
     var showSpecialSearchRoots =
         this.dialogType == DialogType.SELECT_OPEN_FILE ||
         this.dialogType == DialogType.SELECT_OPEN_MULTI_FILE ||
         this.dialogType == DialogType.FULL_PAGE;
 
     this.fileFilter_ = new FileFilter(
         this.metadataCache_,
         false  /* Don't show dot files by default. */);
@@ skipping 646 matching lines @@
    */
   FileManager.prototype.initDialogType_ = function() {
     var defaultTitle;
     var okLabel = str('OPEN_LABEL');
 
     switch (this.dialogType) {
       case DialogType.SELECT_FOLDER:
         defaultTitle = str('SELECT_FOLDER_TITLE');
         break;
 
+      case DialogType.SELECT_UPLOAD_FOLDER:
+        defaultTitle = str('SELECT_UPLOAD_FOLDER_TITLE');
+        okLabel = str('UPLOAD_LABEL');
+        break;
+
       case DialogType.SELECT_OPEN_FILE:
         defaultTitle = str('SELECT_OPEN_FILE_TITLE');
         break;
 
       case DialogType.SELECT_OPEN_MULTI_FILE:
         defaultTitle = str('SELECT_OPEN_MULTI_FILE_TITLE');
         break;
 
       case DialogType.SELECT_SAVEAS_FILE:
         defaultTitle = str('SELECT_SAVEAS_FILE_TITLE');
@@ skipping 1205 matching lines @@
           var path = path.replace(/\/[^\/]+$/, '');
           this.directoryModel_.changeDirectory(path);
         }
         break;
 
       case '13':  // Enter => Change directory or perform default action.
         // TODO(dgozman): move directory action to dispatchSelectionAction.
         var selection = this.getSelection();
         if (selection.totalCount == 1 &&
             selection.entries[0].isDirectory &&
-            this.dialogType != DialogType.SELECT_FOLDER) {
+            this.dialogType != DialogType.SELECT_FOLDER &&
+            this.dialogType != DialogType.SELECT_UPLOAD_FOLDER) {
           event.preventDefault();
           this.onDirectoryAction(selection.entries[0]);
         } else if (this.dispatchSelectionAction_()) {
           event.preventDefault();
         }
         break;
     }
 
     switch (event.keyIdentifier) {
       case 'Home':
@@ skipping 298 matching lines @@
                          resolveSuccessCallback, resolveErrorCallback);
       };
 
       this.validateFileName_(currentDirUrl, filename, checkOverwriteAndFinish);
       return;
     }
 
     var files = [];
     var selectedIndexes = this.currentList_.selectionModel.selectedIndexes;
 
-    if (this.dialogType == DialogType.SELECT_FOLDER &&
+    if ((this.dialogType == DialogType.SELECT_FOLDER ||
+         this.dialogType == DialogType.SELECT_UPLOAD_FOLDER) &&
         selectedIndexes.length == 0) {
       var url = this.getCurrentDirectoryURL();
       var singleSelection = {
         urls: [url],
         multiple: false,
         filterIndex: this.getSelectedFilterIndex_()
       };
       this.selectFilesAndClose_(singleSelection);
       return;
     }
@@ skipping 24 matching lines @@
       this.selectFilesAndClose_(multipleSelection);
       return;
     }
 
     // Everything else must have exactly one.
     if (files.length > 1)
       throw new Error('Too many files selected!');
 
     var selectedEntry = dm.item(selectedIndexes[0]);
 
-    if (this.dialogType == DialogType.SELECT_FOLDER) {
+    if (this.dialogType == DialogType.SELECT_FOLDER ||
+        this.dialogType == DialogType.SELECT_UPLOAD_FOLDER) {
       if (!selectedEntry.isDirectory)
         throw new Error('Selected entry is not a folder!');
     } else if (this.dialogType == DialogType.SELECT_OPEN_FILE) {
       if (!selectedEntry.isFile)
         throw new Error('Selected entry is not a file!');
     }
 
     var singleSelection = {
       urls: [files[0]],
       multiple: false,
@@ skipping 513 matching lines @@
    */
   FileManager.prototype.setCtrlKeyPressed_ = function(flag) {
     this.ctrlKeyPressed_ = flag;
     // Before the DOM is constructed, the key event can be handled.
     var cacheClearCommand =
         this.document_.querySelector('#drive-clear-local-cache');
     if (cacheClearCommand)
       cacheClearCommand.canExecuteChange();
   };
 })();