MD History: Focus the search field on load without 'showing' it

chrome/browser/resources/md_history/app.js

 // Copyright 2016 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.
 
 cr.define('md_history', function() {
   var lazyLoadPromise = null;
   function ensureLazyLoaded() {
     if (!lazyLoadPromise) {
       lazyLoadPromise = new Promise(function(resolve, reject) {
         Polymer.Base.importHref(
@@ skipping 96 matching lines @@
 
   onFirstRender: function() {
     setTimeout(function() {
       chrome.send(
           'metricsHandler:recordTime',
           ['History.ResultsRenderedTime', window.performance.now()]);
     });
 
     // Focus the search field on load. Done here to ensure the history page
     // is rendered before we try to take focus.
-    if (!this.hasDrawer_) {
-      this.focusToolbarSearchField();
+    var searchField =
+        /** @type {HistoryToolbarElement} */ (this.$.toolbar).searchField;
+    if (!searchField.narrow) {
+      searchField.getSearchInput().focus();
     }
 
     // Lazily load the remainder of the UI.
     md_history.ensureLazyLoaded();
   },
 
   /** Overridden from IronScrollTargetBehavior */
   _scrollHandler: function() {
     if (this.scrollTarget)
       this.toolbarShadow_ = this.scrollTarget.scrollTop != 0;
@@ skipping 40 matching lines @@
   historyResult: function(info, results) {
     this.set('queryState_.querying', false);
     this.set('queryResult_.info', info);
     this.set('queryResult_.results', results);
     var listContainer =
         /** @type {HistoryListContainerElement} */ (this.$['history']);
     listContainer.historyResult(info, results);
   },
 
   /**
-   * Focuses the search bar in the toolbar.
+   * Shows and focuses the search bar in the toolbar.
    */
   focusToolbarSearchField: function() { this.$.toolbar.showSearchField(); },
 
   /**
    * @param {Event} e
    * @private
    */
   onCanExecute_: function(e) {
     e = /** @type {cr.ui.CanExecuteEvent} */(e);
     switch (e.command.id) {
@@ skipping 149 matching lines @@
             break;
         }
         break;
     }
 
     md_history.BrowserService.getInstance().recordHistogram(
       'History.HistoryPageView', histogramValue, HistoryPageViewHistogram.END
     );
   },
 });