Make downloads list keyboard shortcuts more consistent.

chrome/browser/resources/history/history.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.
 
 <include src="../uber/uber_utils.js">
 <include src="history_focus_manager.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // Globals:
 /** @const */ var RESULTS_PER_PAGE = 150;
@@ skipping 232 matching lines @@
       chrome.send('removeBookmark', [self.url_]);
 
       this.model_.getView().onBeforeUnstarred(this);
       bookmarkSection.classList.remove('starred');
       this.model_.getView().onAfterUnstarred(this);
 
       bookmarkSection.removeEventListener('click', f);
       e.preventDefault();
     }.bind(this));
   }
+  if (focusless)
+    bookmarkSection.tabIndex = -1;
   entryBox.appendChild(bookmarkSection);
 
   var visitEntryWrapper = /** @type {HTMLElement} */(
       entryBox.appendChild(document.createElement('div')));
   if (addTitleFavicon || this.blockedVisit)
     visitEntryWrapper.classList.add('visit-entry');
   if (this.blockedVisit) {
     visitEntryWrapper.classList.add('blocked-indicator');
     visitEntryWrapper.appendChild(this.getVisitAttemptDOM_());
   } else {
@@ skipping 625 matching lines @@
 
 /**
  * @constructor
  * @implements {cr.ui.FocusRow.Observer}
  */
 function HistoryFocusObserver() {}
 
 HistoryFocusObserver.prototype = {
   /** @override */
   onActivate: function(row) {
-    this.getActiveRowElement_(row).classList.add('active');
+    row.getRowElement().classList.add('active');
   },
 
   /** @override */
   onDeactivate: function(row) {
-    this.getActiveRowElement_(row).classList.remove('active');
+    row.getRowElement().classList.remove('active');
   },
 
   /**
-   * @param {cr.ui.FocusRow} row The row to find an element for.
+   * @param {Element} item The row item to find a a row element for.
    * @return {Element} |row|'s "active" element.
-   * @private
+   * @override
    */
-  getActiveRowElement_: function(row) {
-    return findAncestorByClass(row.items[0], 'entry') ||
-           findAncestorByClass(row.items[0], 'site-domain-wrapper');
+  getRowElement: function(item) {
+    return findAncestorByClass(item, 'entry') ||
+           findAncestorByClass(item, 'site-domain-wrapper');
+  },
+
+  /** @override */
+  onElementIdMiss: function(row, expectedId) {
+    // Clickable titles.
+    if (expectedId == 'domain')
+      return 'title';
+    if (expectedId == 'title')
+      return 'domain';
+
+    // Select the title or the domain if there is no bookmarked star.
+    if (expectedId == 'star') {
+      if (row.elementIds.indexOf('title') != -1)
+        return 'title';
+      return 'domain';
+    }
+
+    if (expectedId == 'menu')
+      return row.elementIds[row.elementIds.length - 1];
+
+    return null;
   },
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // HistoryFocusGrid:
 
 /**
  * @param {Node=} opt_boundary
  * @param {cr.ui.FocusRow.Observer=} opt_observer
  * @constructor
@@ skipping 273 matching lines @@
 HistoryView.prototype.onBeforeRemove = function(visit) {
   assert(this.currentVisits_.indexOf(visit) >= 0);
 
   var pos = this.focusGrid_.getPositionForTarget(document.activeElement);
   if (!pos)
     return;
 
   var row = this.focusGrid_.rows[pos.row + 1] ||
             this.focusGrid_.rows[pos.row - 1];
   if (row)
-    row.focusIndex(Math.min(pos.col, row.items.length - 1));
+    row.setFocusId(pos.elementId);
 };
 
 /** @param {Visit} visit The visit about to be unstarred. */
 HistoryView.prototype.onBeforeUnstarred = function(visit) {
   assert(this.currentVisits_.indexOf(visit) >= 0);
   assert(visit.bookmarkStar == document.activeElement);
 
   var pos = this.focusGrid_.getPositionForTarget(document.activeElement);
   var row = this.focusGrid_.rows[pos.row];
-  row.focusIndex(Math.min(pos.col + 1, row.items.length - 1));
+  row.setFocusId(pos.elementId);
 };
 
 /** @param {Visit} visit The visit that was just unstarred. */
 HistoryView.prototype.onAfterUnstarred = function(visit) {
   this.updateFocusGrid_();
 };
 
 /**
  * Removes a single entry from the view. Also removes gaps before and after
  * entry if necessary.
@@ skipping 439 matching lines @@
   // time column.
   this.setTimeColumnWidth_();
 };
 
 var focusGridRowSelector = [
   ':-webkit-any(.day-results, .search-results) > .entry:not(.fade-out)',
   '.expand .grouped .entry:not(.fade-out)',
   '.site-domain-wrapper'
 ].join(', ');
 
-var focusGridColumnSelector = [
-  '.entry-box input',
-  '.bookmark-section.starred',
-  '.title a',
-  '.drop-down',
-  '.domain-checkbox',
-  '[is="action-link"]',
-].join(', ');
+/**
+ * Add a column to |focusRow| if it exists in |row|.
+ * @param {Element} row The row that should contain the element.
+ * @param {cr.ui.FocusRow} focusRow The focus row to add the element to.
+ * @param {string} query A query to select the appropriate element in |row|.
+ * @param {string} elementId The elementId to use in |focusRow|.
+ * @private
+ */
+HistoryView.prototype.addFocusRow_ = function(row, focusRow, query, elementId) {
+  var element = row.querySelectorAll(query);
+
+  // There should only be 0 or 1 matches.
+  if (element.length == 1)
+    focusRow.setFocusableElementId(element[0], elementId);
+  else
+    assert(element.length == 0);
+};
 
 /** @private */
 HistoryView.prototype.updateFocusGrid_ = function() {
   var rows = this.resultDiv_.querySelectorAll(focusGridRowSelector);
-  var grid = [];
+  this.focusGrid_.destroy();
 
   for (var i = 0; i < rows.length; ++i) {
     assert(rows[i].parentNode);
-    grid.push(rows[i].querySelectorAll(focusGridColumnSelector));
+    var focusRow = this.focusGrid_.createRow();
+
+    // These 2 buttons are mutually exclusive, but visually the same.

[dmazzoni, 2015/01/15 19:38:19]

I don't quite understand this comment.

[hcarmona, 2015/01/16 21:39:06]

Done.

+    this.addFocusRow_(rows[i], focusRow, '.entry-box input', 'checkbox');
+    this.addFocusRow_(rows[i], focusRow, '.domain-checkbox', 'checkbox');
+
+    this.addFocusRow_(rows[i], focusRow, '.bookmark-section.starred', 'star');
+    this.addFocusRow_(rows[i], focusRow, '[is="action-link"]', 'domain');
+    this.addFocusRow_(rows[i], focusRow, '.title a', 'title');
+    this.addFocusRow_(rows[i], focusRow, '.drop-down', 'menu');
+
+    this.focusGrid_.addRow(focusRow);
   }
-
-  this.focusGrid_.setGrid(grid);
 };
 
 /**
  * Update the visibility of the page navigation buttons.
  * @private
  */
 HistoryView.prototype.updateNavBar_ = function() {
   this.updateRangeButtons_();
 
   // If grouping by domain is enabled, there's a control bar on top, don't show
@@ skipping 674 matching lines @@
     historyView.reload();
 }
 
 // Add handlers to HTML elements.
 document.addEventListener('DOMContentLoaded', load);
 
 // This event lets us enable and disable menu items before the menu is shown.
 document.addEventListener('canExecute', function(e) {
   e.canExecute = true;
 });