[Files.app] Remove OK and Cancel buttons in task picker dialog

chrome/browser/resources/file_manager/foreground/js/default_action_dialog.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';
 
 
 /**
  * DefaultActionDialog contains a message, a list box, an ok button, and a
  * cancel button.
@@ skipping 18 matching lines @@
     this.frame_.insertBefore(this.list_, this.text_.nextSibling);
 
     this.selectionModel_ = this.list_.selectionModel =
         new cr.ui.ListSingleSelectionModel();
     this.dataModel_ = this.list_.dataModel = new cr.ui.ArrayDataModel([]);
 
     // List has max-height defined at css, so that list grows automatically,
     // but doesn't exceed predefined size.
     this.list_.autoExpands = true;
     this.list_.activateItemAtIndex = this.activateItemAtIndex_.bind(this);
+    // Use 'click' instead of 'change' for keyboard users.
+    this.list_.addEventListener('click', this.onSelected_.bind(this));
 
     this.initialFocusElement_ = this.list_;
 
     var self = this;
 
     // Binding stuff doesn't work with constructors, so we have to create
     // closure here.
     this.list_.itemConstructor = function(item) {
       return self.renderItem(item);
     };
@@ skipping 37 matching lines @@
     return result;
   };
 
   /**
    * Shows dialog.
    *
    * @param {string} title Title in dialog caption.
    * @param {string} message Message in dialog caption.
    * @param {Array.<Object>} items Items to render in the list.
    * @param {number} defaultIndex Item to select by default.
-   * @param {function(Object=)} opt_onOk OK callback with the selected item.
-   * @param {function()=} opt_onCancel Cancel callback.
+   * @param {function(Object)} onSelected Callback which called when an item is

[arv (Not doing code reviews), 2014/01/06 15:13:34]

Callback which _is_ called ...

[yoshiki, 2014/01/08 04:59:02]

Done.

+   *     selected.
    */
   DefaultActionDialog.prototype.show = function(title, message, items,
-      defaultIndex, opt_onOk, opt_onCancel) {
+      defaultIndex, onSelectedItem) {

[arv (Not doing code reviews), 2014/01/06 15:13:34]

The @param does not match

[yoshiki, 2014/01/08 04:59:02]

Done.

 
-    var show = FileManagerDialogBase.prototype.showOkCancelDialog.call(
-        this, title, message, opt_onOk, opt_onCancel);
+    this.onSelectedItemCallback_ = onSelectedItem;
+
+    var show = FileManagerDialogBase.prototype.showTitleAndTextDialog.call(
+        this, title, message);
 
     if (!show) {
       console.error('DefaultActionDialog can\'t be shown.');
       return;
     }
 
     if (!message) {
       this.text_.setAttribute('hidden', 'hidden');
     } else {
       this.text_.removeAttribute('hidden');
     }
 
     this.list_.startBatchUpdates();
     this.dataModel_.splice(0, this.dataModel_.length);
     for (var i = 0; i < items.length; i++) {
       this.dataModel_.push(items[i]);
     }
     this.selectionModel_.selectedIndex = defaultIndex;
     this.list_.endBatchUpdates();
   };
 
   /**
    * List activation handler. Closes dialog and calls 'ok' callback.
    * @param {number} index Activated index.
    */
   DefaultActionDialog.prototype.activateItemAtIndex_ = function(index) {
     this.hide();
-    this.onOk_(this.dataModel_.item(index));
+    this.onSelectedItemCallback_(this.dataModel_.item(index));
   };
 
   /**
    * Closes dialog and invokes callback with currently-selected item.
-   * @override
    */
-  DefaultActionDialog.prototype.onOkClick_ = function() {
-    this.activateItemAtIndex_(this.selectionModel_.selectedIndex);
+  DefaultActionDialog.prototype.onSelected_ = function() {
+    if (this.selectionModel_.selectedIndex !== -1)
+      this.activateItemAtIndex_(this.selectionModel_.selectedIndex);
   };
 
   /**
    * @override
    */
   DefaultActionDialog.prototype.onContainerKeyDown_ = function(event) {
     // Handle Escape.
     if (event.keyCode == 27) {
-      this.onCancelClick_(event);
+    this.hide();

[arv (Not doing code reviews), 2014/01/06 15:13:34]

wrong indentation

[yoshiki, 2014/01/08 04:59:02]

Done.

       event.preventDefault();
     } else if (event.keyCode == 32 || event.keyCode == 13) {
-      this.onOkClick_();
+      this.onSelected_();
       event.preventDefault();
     }
   };
 
   return {DefaultActionDialog: DefaultActionDialog};
 });