Add a notice about other forms of browsing history to the History WebUI.

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 626 matching lines @@
   var lastVisit = this.visits_.slice(-1)[0];
   var lastDay = lastVisit ? lastVisit.dateRelativeDay : null;
 
   for (var i = 0, result; result = results[i]; i++) {
     var thisDay = result.dateRelativeDay;
     var isSameDay = lastDay == thisDay;
     this.visits_.push(new Visit(result, isSameDay, this));
     lastDay = thisDay;
   }
 
-  if (loadTimeData.getBoolean('isUserSignedIn')) {
-    var message = loadTimeData.getString(
-        info.hasSyncedResults ? 'hasSyncedResults' : 'noSyncedResults');
-    this.view_.showNotification(message);
-  }
-
   this.updateSearch_();
 };
 
 /**
+ * Shows a notification explaining that there are other forms of browsing
+ * history present on the server.
+ * @param {boolean} hasSyncedResults Whether there are synced results.
+ * @param {boolean} includeOtherFormsOfBrowsingHistory Whether to include
+ *     a sentence about the existence of other forms of browsing history.
+ */
+HistoryModel.prototype.showNotification = function(

[Dan Beam, 2016/03/31 01:05:43]

this belongs on the view instead

[msramek, 2016/03/31 19:20:01]

Done. I originally put it here, since I extracted it from
HistoryModel.prototype.addResults(), which would in turn call
this.view_.showNotification().

This means that there already is a method HistoryModel.showNotification() which
is supposed to be generic. I will define HistoryModel.showWebHistoryNotification
as its specialization that shows a notification specifically about web history
results and other forms of history.

+    hasSyncedResults, includeOtherFormsOfBrowsingHistory) {
+  var message = '';
+
+  if (loadTimeData.getBoolean('isUserSignedIn')) {
+    message = '<div>' + loadTimeData.getString(
+        hasSyncedResults ? 'hasSyncedResults' : 'noSyncedResults') + '</div>';
+  }
+
+  if (includeOtherFormsOfBrowsingHistory) {
+    message += '<div>' + loadTimeData.getString('otherFormsOfBrowsingHistory') +
+               '</div>';
+  }
+
+  if (message != '')

[Dan Beam, 2016/03/31 01:05:43]

if (message)

[msramek, 2016/03/31 19:20:01]

Done.

+    this.view_.showNotification(message);
+};
+
+/**
  * @return {number} The number of visits in the model.
  */
 HistoryModel.prototype.getSize = function() {
   return this.visits_.length;
 };
 
 /**
  * Get a list of visits between specified index positions.
  * @param {number} start The start index.
  * @param {number} end The end index.
@@ skipping 600 matching lines @@
     this.clear_();
     this.onModelReady(true);  // Shows "No entries" message.
   }
 };
 
 /**
  * Adjusts the position of the notification bar based on the size of the page.
  */
 HistoryView.prototype.positionNotificationBar = function() {
   var bar = $('notification-bar');
+  var container = $('top-container');
 
-  // 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');
+  // If the bar does not fit beside the editing controls, or if it contains
+  // more than one message, put it into the overflow state.
+  if ((bar.getBoundingClientRect().top >=
+       $('editing-controls').getBoundingClientRect().bottom) ||
+       bar.childElementCount > 1) {
+    container.classList.add('overflow');
   } else {
-    bar.classList.remove('alone');
+    container.classList.remove('overflow');

[Dan Beam, 2016/03/31 01:05:43]

var shouldOverflow = ...;
$('container').classList.toggle('overflow', shouldOverflow);

[msramek, 2016/03/31 19:20:01]

Done.

   }
 };
 
 /**
  * @param {!Element} el An element to look for.
  * @return {boolean} Whether |el| is in |this.focusGrid_|.
  */
 HistoryView.prototype.isInFocusGrid = function(el) {
   return this.focusGrid_.getRowIndexForTarget(el) != -1;
 };
@@ skipping 1044 matching lines @@
 /**
  * Our history system calls this function with results from searches.
  * @param {HistoryQuery} info An object containing information about the query.
  * @param {Array<HistoryEntry>} results A list of results.
  */
 function historyResult(info, results) {
   historyModel.addResults(info, results);
 }
 
 /**
+ * Called by the history backend after receiving results and after discovering
+ * the existence of other forms of browsing history.
+ * @param {boolean} hasSyncedResults Whether there are synced results.
+ * @param {boolean} includeOtherFormsOfBrowsingHistory Whether to include
+ *     a sentence about the existence of other forms of browsing history.
+ */
+function showNotification(
+    hasSyncedResults, includeOtherFormsOfBrowsingHistory) {
+  historyModel.showNotification(

[Dan Beam, 2016/03/31 01:05:43]

historyView.showNotification

[msramek, 2016/03/31 19:20:01]

Done. As mentioned above, let's rename it to showWebHistoryNotification() and
use as a layer above the already existing showNotification().

+      hasSyncedResults, includeOtherFormsOfBrowsingHistory);
+}
+
+/**
  * Called by the history backend when history removal is successful.
  */
 function deleteComplete() {
   historyModel.deleteComplete();
 }
 
 /**
  * Called by the history backend when history removal is unsuccessful.
  */
 function deleteFailed() {
@@ skipping 11 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;
 });