Merge 199208 "CrOS Files.app: Support format command on new UI."

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 606 matching lines @@
 
     CommandUtil.registerCommand(doc, 'change-default-app',
         Commands.changeDefaultAppCommand, this);
 
     if (!util.platform.newUI()) {
       CommandUtil.registerCommand(this.directoryTree_, 'unmount',
           Commands.unmountCommand, this.directoryTree_, this);
 
       CommandUtil.registerCommand(this.directoryTree_, 'import-photos',
           Commands.importCommand, this.directoryTree_);
+
+      CommandUtil.registerCommand(doc, 'format',
+          Commands.formatCommand, this.directoryTree_, this,
+          this.directoryModel_);
     } else {
       CommandUtil.registerCommand(this.volumeList_, 'unmount',
           Commands.unmountCommand, this.volumeList_, this);
 
       CommandUtil.registerCommand(this.volumeList_, 'import-photos',
           Commands.importCommand, this.volumeList_);
+
+      CommandUtil.registerCommand(doc, 'format',
+          Commands.formatCommand, this.volumeList_, this,
+          this.directoryModel_);
     }
 
-    CommandUtil.registerCommand(doc, 'format',
-        Commands.formatCommand, this.directoryTree_, this,
-        this.directoryModel_);
-
     CommandUtil.registerCommand(doc, 'delete',
         Commands.deleteFileCommand, this);
 
     CommandUtil.registerCommand(doc, 'rename',
         Commands.renameFileCommand, this);
 
     CommandUtil.registerCommand(doc, 'volume-help',
         Commands.volumeHelpCommand, this);
 
     CommandUtil.registerCommand(doc, 'drive-buy-more-space',
@@ skipping 2992 matching lines @@
    * Set the flag expressing whether the ctrl key is pressed or not.
    * @param {boolean} flag New value of the flag
    * @private
    */
   FileManager.prototype.setCtrlKeyPressed_ = function(flag) {
     this.ctrlKeyPressed_ = flag;
     this.document_.querySelector('#drive-clear-local-cache').canExecuteChange();
     this.document_.querySelector('#drive-reload').canExecuteChange();
   };
 })();