history: fix more focus oddness.

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 194 matching lines @@
         this.domain_));
     checkbox.addEventListener('click', checkboxClicked);
     entryBox.appendChild(checkbox);
 
     if (focusless)
       checkbox.tabIndex = -1;
 
     if (!isMobileVersion()) {
       // Clicking anywhere in the entryBox will check/uncheck the checkbox.
       entryBox.setAttribute('for', checkbox.id);
-      entryBox.addEventListener('mousedown', entryBoxMousedown);
+      entryBox.addEventListener('mousedown', this.handleMousedown_.bind(this));
       entryBox.addEventListener('click', entryBoxClick);
       entryBox.addEventListener('keydown', this.handleKeydown_.bind(this));
     }
   }
 
   // Keep track of the drop down that triggered the menu, so we know
   // which element to apply the command to.
   // TODO(dubroy): Ideally we'd use 'activate', but MenuButton swallows it.
   var setActiveVisit = function(e) {
     activeVisit = self;
@@ skipping 266 matching lines @@
  * @param {Event} e A keydown event to handle.
  * @private
  */
 Visit.prototype.handleKeydown_ = function(e) {
   // Delete or Backspace should delete the entry if allowed.
   if (e.keyIdentifier == 'U+0008' || e.keyIdentifier == 'U+007F')
     this.removeEntryFromHistory_(e);
 };
 
 /**
+ * @param {Event} event A mousedown event.
+ * @private
+ */
+Visit.prototype.handleMousedown_ = function(event) {
+  // Prevent text selection when shift-clicking to select multiple entries.
+  if (event.shiftKey) {
+    event.preventDefault();
+
+    if (this.model_.getView().isInFocusGrid(event.target))
+      event.target.focus();
+  }
+};
+
+/**
  * Removes a history entry on click or keydown and finds a new entry to focus.
  * @param {Event} e A click or keydown event.
  * @private
  */
 Visit.prototype.removeEntryFromHistory_ = function(e) {
   if (!this.model_.deletingHistoryAllowed || this.model_.isDeletingVisits() ||
       this.domNode_.classList.contains('fade-out')) {
     return;
   }
 
@@ skipping 379 matching lines @@
    * @return {Element} |row|'s "active" element.
    * @private
    */
   getActiveRowElement_: function(row) {
     return findAncestorByClass(row.items[0], 'entry') ||
            findAncestorByClass(row.items[0], 'site-domain-wrapper');
   },
 };
 
 ///////////////////////////////////////////////////////////////////////////////
+// HistoryFocusGrid:
+
+/**
+ * @param {Node=} opt_boundary
+ * @param {cr.ui.FocusRow.Observer=} opt_observer
+ * @constructor
+ * @extends {cr.ui.FocusGrid}
+ */
+function HistoryFocusGrid(opt_boundary, opt_observer) {
+  cr.ui.FocusGrid.apply(this, arguments);
+}
+
+HistoryFocusGrid.prototype = {
+  __proto__: cr.ui.FocusGrid.prototype,
+
+  /** @override */
+  onMousedown: function(row, e) {
+    return !!findAncestorByClass(e.target, 'menu-button');
+  },
+};
+
+///////////////////////////////////////////////////////////////////////////////
 // HistoryView:
 
 /**
  * Functions and state for populating the page with HTML. This should one-day
  * contain the view and use event handlers, rather than pushing HTML out and
  * getting called externally.
  * @param {HistoryModel} model The model backing this view.
  * @constructor
  */
 function HistoryView(model) {
   this.editButtonTd_ = $('edit-button');
   this.editingControlsDiv_ = $('editing-controls');
   this.resultDiv_ = $('results-display');
-  this.focusGrid_ = new cr.ui.FocusGrid(this.resultDiv_,
-                                        new HistoryFocusObserver);
+  this.focusGrid_ = new HistoryFocusGrid(this.resultDiv_,
+                                         new HistoryFocusObserver);
   this.pageDiv_ = $('results-pagination');
   this.model_ = model;
   this.pageIndex_ = 0;
   this.lastDisplayed_ = [];
 
   this.model_.setView(this);
 
   this.currentVisits_ = [];
 
   // If there is no search button, use the search button label as placeholder
@@ skipping 321 matching lines @@
   // If the bar does not fit beside the editing controls, put it into the
   // overflow state.
   if (bar.getBoundingClientRect().top >=
       $('editing-controls').getBoundingClientRect().bottom) {
     bar.classList.add('alone');
   } else {
     bar.classList.remove('alone');
   }
 };
 
+/**
+ * @param {Element} el An element to look for.
+ * @return {boolean} Whether |el| is in |this.focusGrid_|.
+ */
+HistoryView.prototype.isInFocusGrid = function(el) {
+  return !!this.focusGrid_.getPositionForTarget(el);
+};
+
 // HistoryView, private: ------------------------------------------------------
 
 /**
  * Clear the results in the view.  Since we add results piecemeal, we need
  * to clear them out when we switch to a new page or reload.
  * @private
  */
 HistoryView.prototype.clear_ = function() {
   var alertOverlay = $('alertOverlay');
   if (alertOverlay && alertOverlay.classList.contains('showing'))
@@ skipping 889 matching lines @@
 
   var entry = findAncestorByClass(checkbox, 'site-entry');
   if (!entry)
     return;
 
   var groupCheckbox = entry.querySelector('.site-domain-wrapper input');
   if (groupCheckbox)
     groupCheckbox.checked = false;
 }
 
-function entryBoxMousedown(event) {
-  // Prevent text selection when shift-clicking to select multiple entries.
-  if (event.shiftKey)
-    event.preventDefault();
-}
-
 /**
  * Handle click event for entryBoxes.
  * @param {!Event} event A click event.
  */
 function entryBoxClick(event) {
   event = /** @type {!MouseEvent} */(event);
   // Do nothing if a bookmark star is clicked.
   if (event.defaultPrevented)
     return;
   var element = event.target;
@@ skipping 100 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;
 });