Files.app: Make NamingControll class.

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

Index: ui/file_manager/file_manager/foreground/js/file_manager.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 0946555691821c7a8c1a57848938cd0511d67b28..9d2ae418bda79de576874217832a7898db652b15 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -10,6 +10,7 @@
  * latter is not yet implemented).
  *
  * @constructor
+ * @struct
  */
 function FileManager() {
   // --------------------------------------------------------------------------
@@ -167,6 +168,13 @@ function FileManager() {
   this.directoryTree_ = null;
 
   /**
+   * Naming controller.
+   * @type {NamingController}
+   * @private
+   */
+  this.namingController_ = null;
+
+  /**
    * Controller for search UI.
    * @type {SearchController}
    * @private
@@ -551,7 +559,7 @@ function FileManager() {
   Object.preventExtensions(this);
 }
 
-FileManager.prototype = {
+FileManager.prototype = /** @struct */ {
   __proto__: cr.EventTarget.prototype,
   /**
    * @return {DirectoryModel}
@@ -1555,6 +1563,12 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
           }.bind(this)
         });
 
+    // Create naming controller.
+    assert(this.ui_.alertDialog);
+    this.namingController_ = new NamingController(
+        this.fileFilter_,
+        this.ui_.alertDialog);
+
     // Update metadata to change 'Today' and 'Yesterday' dates.
     var today = new Date();
     today.setHours(0);
@@ -2960,9 +2974,10 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
     // TODO(haruki): this.getCurrentDirectoryEntry() might not return the actual
     // parent if the directory content is a search result. Fix it to do proper
     // validation.
-    this.validateFileName_(this.getCurrentDirectoryEntry(),
-                           newName,
-                           validationDone.bind(this));
+    this.namingController_.validateFileName(
+        this.getCurrentDirectoryEntry(),
+        newName,
+        validationDone.bind(this));
   };
 
   /**
@@ -3597,7 +3612,8 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
         throw new Error('Missing filename!');
 
       var directory = this.getCurrentDirectoryEntry();
-      this.validateFileName_(directory, filename, function(isValid) {
+      this.namingController_.validateFileName(
+          directory, filename, function(isValid) {
         if (!isValid)
           return;
 
@@ -3713,30 +3729,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
   };
 
   /**
-   * Verifies the user entered name for file or folder to be created or
-   * renamed to. See also util.validateFileName.
-   *
-   * @param {DirectoryEntry} parentEntry The URL of the parent directory entry.
-   * @param {string} name New file or folder name.
-   * @param {function(boolean)} onDone Function to invoke when user closes the
-   *    warning box or immediatelly if file name is correct. If the name was
-   *    valid it is passed true, and false otherwise.
-   * @private
-   */
-  FileManager.prototype.validateFileName_ = function(
-      parentEntry, name, onDone) {
-    var fileNameErrorPromise = util.validateFileName(
-        parentEntry,
-        name,
-        this.fileFilter_.isFilterHiddenOn());
-    fileNameErrorPromise.then(onDone.bind(null, true), function(message) {
-      this.alert.show(message, onDone.bind(null, false));
-    }.bind(this)).catch(function(error) {
-      console.error(error.stack || error);
-    });
-  };
-
-  /**
    * Toggle whether mobile data is used for sync.
    */
   FileManager.prototype.toggleDriveSyncSettings = function() {