History: Prevent search box from disappearing when search term is deleted.

History: Prevent search box from disappearing when search term is deleted.

Also removed unnecessary calls to updateNavBar_().

This fix is based on http://crrev.com/219018, which had to be reverted
because it introduced a regression.

BUG=263870
TEST=See repro steps in bug.
R=jhawkins@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=221512

[Patrick Dubroy, 2013-09-04 01:59:11]

Sergiu, please take a look. This is the same as the previous fix, except that it
doesn't eliminate the 'has-results' class, because that was also being used to
ensure that the Older/Newer links don't appear at the bottom when the page is
being refreshed.

[Patrick Dubroy, 2013-09-04 21:59:22]

James, can you take a look?

[James Hawkins, 2013-09-04 22:16:42]

lgtm

[commit-bot: I haz the power, 2013-09-04 22:20:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dubroy@chromium.org/23464026/1

[commit-bot: I haz the power, 2013-09-04 23:14:15]

Retried try job too often on ios_dbg_simulator for step(s) ui_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=ios_dbg_si...

[commit-bot: I haz the power, 2013-09-05 02:01:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dubroy@chromium.org/23464026/1

[commit-bot: I haz the power, 2013-09-05 03:00:42]

Retried try job too often on ios_dbg_simulator for step(s) ui_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=ios_dbg_si...

[commit-bot: I haz the power, 2013-09-06 17:39:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dubroy@chromium.org/23464026/1

[commit-bot: I haz the power, 2013-09-06 17:39:36]

Failed to apply patch for chrome/browser/resources/history/history.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/resources/history/history.js
  Hunk #1 FAILED at 938.
  Hunk #2 FAILED at 1298.
  Hunk #3 FAILED at 1326.
  Hunk #4 FAILED at 1335.
  4 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/resources/history/history.js.rej

Patch:       chrome/browser/resources/history/history.js
Index: chrome/browser/resources/history/history.js
diff --git a/chrome/browser/resources/history/history.js
b/chrome/browser/resources/history/history.js
index
1227c99fe478fdc36b50399cc090c380ed4d447a..4ef1b84955ee177c8c873abfa10142e76ef3d81a
100644
--- a/chrome/browser/resources/history/history.js
+++ b/chrome/browser/resources/history/history.js
@@ -938,6 +938,13 @@ HistoryView.prototype.onModelReady = function(doneLoading)
{
     document.body.classList.remove('has-results');
 
   this.updateNavBar_();
+
+  if (isMobileVersion()) {
+    // Hide the search field if it is empty and there are no results.
+    var hasResults = this.model_.visits_.length > 0;
+    var isSearch = this.model_.getSearchText().length > 0;
+    $('search-field').hidden = !(hasResults || isSearch);
+  }
 };
 
 /**
@@ -1298,7 +1305,6 @@ HistoryView.prototype.displayResults_ =
function(doneLoading) {
           createElementWithClassName('div', 'no-results-message'));
       noResults.textContent = loadTimeData.getString('noResults');
       this.resultDiv_.appendChild(resultsFragment);
-      this.updateNavBar_();
       return;
     }
 
@@ -1326,7 +1332,6 @@ HistoryView.prototype.displayResults_ =
function(doneLoading) {
     // Add all the days and their visits to the page.
     this.resultDiv_.appendChild(resultsFragment);
   }
-  this.updateNavBar_();
 };
 
 /**
@@ -1335,9 +1340,10 @@ HistoryView.prototype.displayResults_ =
function(doneLoading) {
  */
 HistoryView.prototype.updateNavBar_ = function() {
   this.updateRangeButtons_();
+
+  // Managed users have the control bar on top, don't show it on the bottom
+  // as well.
   if (!loadTimeData.getBoolean('isManagedProfile')) {
-    // Managed users have the control bar on top, don't show it on the bottom
-    // as well.
     $('newest-button').hidden = this.pageIndex_ == 0;
     $('newer-button').hidden = this.pageIndex_ == 0;
     $('older-button').hidden =

[Patrick Dubroy, 2013-09-06 17:41:11]

Committed patchset #1 manually as r221512 (presubmit successful).