Chromium Code Reviews| Index: chrome/browser/resources/history/other_devices.js |
| diff --git a/chrome/browser/resources/history/other_devices.js b/chrome/browser/resources/history/other_devices.js |
| index 33e4bd46f33ae04f6c3853b023a0732a187630db..2a9657743a7fddb1c2bac71ba9c3da4f7932dcd9 100644 |
| --- a/chrome/browser/resources/history/other_devices.js |
| +++ b/chrome/browser/resources/history/other_devices.js |
| @@ -427,6 +427,34 @@ DevicesView.prototype.increaseRowHeight = function(row, height) { |
| // DevicesView, Private ------------------------------------------------------- |
| /** |
| + * Provides an implementation for a single column grid. |
| + * @constructor |
| + * @param {Element} rowElement The element representing this row. |
| + * @param {Node} boundary Focus events are ignored outside of this node. |
| + * @extends {cr.ui.FocusRow} |
| + */ |
| +DevicesView.SingleColumnFocusRow = function(rowElement, boundary) { |
| + rowElement.__proto__ = DevicesView.SingleColumnFocusRow.prototype; |
| + rowElement.decorate(boundary); |
| + return rowElement; |
| +}; |
| + |
| +DevicesView.SingleColumnFocusRow.prototype = { |
| + __proto__: cr.ui.FocusRow.prototype, |
| + |
| + /** @override */ |
| + decorate: function(boundary, opt_delegate) { |
| + cr.ui.FocusRow.prototype.decorate.apply(this, arguments); |
| + this.addFocusableElement(this); |
| + }, |
| + |
| + /** @override */ |
| + getEquivalentElement: function(element) { |
| + return this; |
| + }, |
| +}; |
| + |
| +/** |
| * Update the page with results. |
| * @private |
| */ |
| @@ -479,16 +507,15 @@ DevicesView.prototype.displayResults_ = function() { |
| this.focusGrids_.forEach(function(grid) { grid.destroy(); }); |
| this.focusGrids_.length = 0; |
| - var singleColumn = function(e) { return [e]; }; |
| - |
| var devices = this.resultDiv_.querySelectorAll('.device-contents'); |
| for (var i = 0; i < devices.length; ++i) { |
| var rows = devices[i].querySelectorAll('.device-tab-entry, button'); |
| if (!rows.length) |
| continue; |
| - var grid = new cr.ui.FocusGrid(devices[i]); |
| - grid.setGrid(Array.prototype.map.call(rows, singleColumn)); |
| + var grid = new cr.ui.FocusGrid(); |
| + for (var i = 0; i < rows.length; ++i) |
|
Dan Beam
2015/01/24 02:37:08
nit: curlies
hcarmona
2015/01/27 18:30:40
Done.
|
| + grid.addRow(new DevicesView.SingleColumnFocusRow(rows[i], devices[i])); |
| this.focusGrids_.push(grid); |
| } |
| }; |